Fix regression of gclient-new-workdir.py

gclient-new-workdir.py should work on systems not supporting reflink now.

Bug: 728903, 721585
Change-Id: I1385c4281bbf61d4ccae64c3595a39972fbe9d9e
Reviewed-on: https://chromium-review.googlesource.com/522232
Commit-Queue: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
changes/32/522232/2
Wei-Yin Chen (陳威尹) 8 years ago committed by Commit Bot
parent 6d0d04458d
commit 2fa1203a22

@ -56,7 +56,8 @@ def support_cow(src, dest):
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
return False return False
finally: finally:
os.remove(dest) if os.path.isfile(dest):
os.remove(dest)
return True return True
@ -64,7 +65,7 @@ def try_vol_snapshot(src, dest):
try: try:
subprocess.check_call(['btrfs', 'subvol', 'snapshot', src, dest], subprocess.check_call(['btrfs', 'subvol', 'snapshot', src, dest],
stderr=subprocess.STDOUT) stderr=subprocess.STDOUT)
except subprocess.CalledProcessError: except (subprocess.CalledProcessError, OSError):
return False return False
return True return True

Loading…
Cancel
Save