gclient.py - Issue 12764004: Don't delete trees that have an exact match in entries either

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.py

Issue 12764004: Don't delete trees that have an exact match in entries either (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master

Patch Set: Created 7 years, 9 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.py

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

index 3467dcd55a38f81d2b64e10c47a4e70eb3eb5285..8c54d374320d2251dda917397362818b1fba5d62 100644

--- a/gclient.py

+++ b/gclient.py

@@ -1136,7 +1136,8 @@ solutions = [

for path in path_list)

# Use entry and not entry_fixed there.

- if ((not any(path.startswith(entry + '/') for path in entries)) and

+ if (entry not in entries and

+ (not any(path.startswith(entry + '/') for path in entries)) and

os.path.exists(e_dir)):

file_list = []

scm = gclient_scm.CreateSCM(prev_url, self.root_dir, entry_fixed)

« no previous file with comments | « no previous file | no next file » | no next file with comments »