Merge "Don't try to remove Cargo.lock if it doesn't exist." am: fa51a80114 am: a9136a088c am: 89856f54d1 am: 7954a1b5dc

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

Change-Id: I4208422b70ee60298e67978b135dc666697ed653
This commit is contained in:
Treehugger Robot
2022-01-06 16:27:40 +00:00
committed by Automerger Merge Worker

View File

@@ -1370,7 +1370,8 @@ class Runner(object):
os.environ['PATH'] = saved_path
if not self.dry_run:
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
os.rename(cargo_lock_saved, cargo_lock)
return self