From 8f9c69f5b0883352ca7e2a8d0c5955f62220ea4f Mon Sep 17 00:00:00 2001 From: "bradnelson@google.com" Date: Thu, 17 Sep 2009 00:48:28 +0000 Subject: [PATCH] Fixing errors in gclient on a gclient revert --nohooks on windows. BUG=None TEST=None TBR=maruel Review URL: http://codereview.chromium.org/213002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@26425 0039d316-1c4b-4281-b951-d872f2087c98 --- gclient_scm.py | 4 ++-- gclient_utils.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gclient_scm.py b/gclient_scm.py index 2096496b3..f38f09594 100644 --- a/gclient_scm.py +++ b/gclient_scm.py @@ -183,7 +183,7 @@ class SCMWrapper(object): "try again." % (url, checkout_path)) # Ok delete it. print("\n_____ switching %s to a new checkout" % self.relpath) - RemoveDirectory(checkout_path) + gclient_utils.RemoveDirectory(checkout_path) # We need to checkout. command = ['checkout', url, checkout_path] if revision: @@ -232,7 +232,7 @@ class SCMWrapper(object): try: os.remove(file_path) except EnvironmentError: - RemoveDirectory(file_path) + gclient_utils.RemoveDirectory(file_path) if file[0][0] != '?': # For any other status, svn revert will work. diff --git a/gclient_utils.py b/gclient_utils.py index ff8a24038..1b11f96ae 100644 --- a/gclient_utils.py +++ b/gclient_utils.py @@ -13,6 +13,7 @@ # limitations under the License. import os +import stat import subprocess import sys import xml.dom.minidom