Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(180)

Unified Diff: gclient.py

Issue 12537007: Don't try to delete directories if sub directories are still part of the client (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: updates 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gclient.py
diff --git a/gclient.py b/gclient.py
index 2ad86d3cd9c32af785ba8e1aad8b0097e6cf62ca..3467dcd55a38f81d2b64e10c47a4e70eb3eb5285 100644
--- a/gclient.py
+++ b/gclient.py
@@ -1128,8 +1128,16 @@ solutions = [
# Fix path separator on Windows.
entry_fixed = entry.replace('/', os.path.sep)
e_dir = os.path.join(self.root_dir, entry_fixed)
+
+ def _IsParentOfAny(parent, path_list):
+ parent_plus_slash = parent + '/'
+ return any(
+ path[:len(parent_plus_slash)] == parent_plus_slash
+ for path in path_list)
+
# Use entry and not entry_fixed there.
- if entry not in entries and os.path.exists(e_dir):
+ if ((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)
scm.status(self._options, [], file_list)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698