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

Merge #125

Browse Source 
125: Canonicalize rustup path before checking if its origin (fix #124) r=r-darwish a=r-darwish

bors r+

Co-authored-by: Roey Darwish Dror <roey.ghost@gmail.com>
This commit is contained in:
bors[bot]
2019-02-12 18:38:27 +00:00
parent 030d266a39 c3db8c0f04
commit 13ecb19e29
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/steps/generic.rs
View File

@@ -3,6 +3,7 @@ use crate::executor::{CommandExt, RunType};
use crate::terminal::print_separator; use crate::terminal::print_separator;
use crate::utils::{self, PathExt}; use crate::utils::{self, PathExt};
use directories::BaseDirs; use directories::BaseDirs;
use failure::ResultExt;
use std::path::PathBuf; use std::path::PathBuf;
use std::process::Command; use std::process::Command;
@@ -59,7 +60,11 @@ pub fn run_rustup(base_dirs: &BaseDirs, run_type: RunType) -> Result<(), Error>
print_separator("rustup"); print_separator("rustup");
if rustup.is_descendant_of(base_dirs.home_dir()) { if rustup
.canonicalize()
.context(ErrorKind::StepFailed)?
.is_descendant_of(base_dirs.home_dir())
{
run_type.execute(&rustup).args(&["self", "update"]).check_run()?; run_type.execute(&rustup).args(&["self", "update"]).check_run()?;
} }