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." am: fa51a80114

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/development/+/1938733

Change-Id: I820245d6d4d18c13461da63b3af3c7961bade5b4
This commit is contained in:
Treehugger Robot
2022-01-06 15:36:39 +00:00
committed by Automerger Merge Worker
parent 71b755b46e fa51a80114
commit a9136a088c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/cargo2android.py
View File

@@ -1370,7 +1370,8 @@ 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
os.remove(cargo_lock) if os.path.exists(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)
return self return self