gclient_scm.py - Issue 23875041: Added SafeRename to better handle problems with git processes locking directories.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gclient_scm.py

Issue 23875041: Added SafeRename to better handle problems with git processes locking directories. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master

Patch Set: Created 7 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: gclient_scm.py

diff --git a/gclient_scm.py b/gclient_scm.py

index bb719ebf7086de0a0f0721d7bb9948939a1eedef..ec9c8d80929e1f2bbb2bd49c8fd932f9b8c98582 100644

--- a/gclient_scm.py

+++ b/gclient_scm.py

@@ -873,8 +873,8 @@ class GitWrapper(SCMWrapper):

print(str(e))

print('Retrying...')

gclient_utils.safe_makedirs(self.checkout_path)

- os.rename(os.path.join(tmp_dir, '.git'),

- os.path.join(self.checkout_path, '.git'))

+ gclient_utils.SafeRename(os.path.join(tmp_dir, '.git'),

+ os.path.join(self.checkout_path, '.git'))

finally:

if os.listdir(tmp_dir):

print('\n_____ removing non-empty tmp dir %s' % tmp_dir)

« no previous file with comments | « no previous file | gclient_utils.py » ('j') | gclient_utils.py » ('J')