LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Don't try to remove Cargo.lock if it doesn't exist."

Browse Source
This commit is contained in:
Treehugger Robot
2022-01-06 15:19:36 +00:00
committed by Gerrit Code Review
parent e62be4dbe8 a32a04851b
commit fa51a80114
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/cargo2android.py
View File

@@ -1370,6 +1370,7 @@ class Runner(object):
os.environ['PATH'] = saved_path os.environ['PATH'] = saved_path
if not self.dry_run: if not self.dry_run:
if not had_cargo_lock: # restore to no Cargo.lock state if not had_cargo_lock: # restore to no Cargo.lock state
if os.path.exists(cargo_lock):
os.remove(cargo_lock) os.remove(cargo_lock)
elif not self.args.use_cargo_lock: # restore saved Cargo.lock elif not self.args.use_cargo_lock: # restore saved Cargo.lock
os.rename(cargo_lock_saved, cargo_lock) os.rename(cargo_lock_saved, cargo_lock)