admin/topgrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not run yay if Python is not the system Python (fixes #13)

Browse Source
This commit is contained in:
Roey Darwish Dror
2018-06-12 21:35:04 +03:00
parent 109be4b756
commit 544d87d3ef
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/linux.rs
View File

@@ -19,6 +19,10 @@ pub enum Distribution {
#[fail(display = "Unknown Linux Distribution")] #[fail(display = "Unknown Linux Distribution")]
struct UnknownLinuxDistribution; struct UnknownLinuxDistribution;
#[derive(Debug, Fail)]
#[fail(display = "Detected Python is not the system Python")]
struct NotSystemPython;
impl Distribution { impl Distribution {
pub fn detect() -> Result<Self, failure::Error> { pub fn detect() -> Result<Self, failure::Error> {
let content = fs::read_to_string("/etc/os-release")?; let content = fs::read_to_string("/etc/os-release")?;
@@ -52,6 +56,17 @@ pub fn upgrade_arch_linux(
terminal: &Terminal, terminal: &Terminal,
) -> Result<(), failure::Error> { ) -> Result<(), failure::Error> {
if let Ok(yay) = which("yay") { if let Ok(yay) = which("yay") {
if let Ok(python) = which("python") {
if python != PathBuf::from("/usr/bin/python") {
terminal.print_warning(format!(
"Python detected at {:?}, which is probably not the system Python.
It's dangerous to run yay since Python based AUR packages will be installed in the wrong location",
python
));
return Err(NotSystemPython.into());
}
}
Command::new(yay).spawn()?.wait()?.check()?; Command::new(yay).spawn()?.wait()?.check()?;
} else { } else {
if let Some(sudo) = &sudo { if let Some(sudo) = &sudo {