summaryrefslogtreecommitdiffstats
path: root/project.py
diff options
context:
space:
mode:
authorDavid Pursehouse <david.pursehouse@sonymobile.com>2015-08-19 18:06:22 +0900
committerDavid Pursehouse <david.pursehouse@sonymobile.com>2015-08-19 13:03:13 +0000
commit25857b8988de60d7c7a8593c6170b2bbf80d748d (patch)
tree04bee330dabe28457033164c3b06d533017803f8 /project.py
parentbdb5271de3fafb9fbec3fde0e8e95e5b061ab0f5 (diff)
downloadgit-repo-25857b8988de60d7c7a8593c6170b2bbf80d748d.tar.gz
Fix formatting of message when retrying clone
Passing the force_sync variable into the string formatting results in the message: "Retrying clone after deleting None" or "Retrying clone after deleting True". Pass the name of the git directory instead. Also, move the print inside the if-block so it's only displayed when the retry is actually going to be attempted. Change-Id: I76d9ecc176cecee4ad512d13e9d1f6bd36aacbbb
Diffstat (limited to 'project.py')
-rw-r--r--project.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/project.py b/project.py
index a117f4df..ac60ccc1 100644
--- a/project.py
+++ b/project.py
@@ -2182,8 +2182,8 @@ class Project(object):
2182 try: 2182 try:
2183 self._CheckDirReference(self.objdir, self.gitdir, share_refs=False) 2183 self._CheckDirReference(self.objdir, self.gitdir, share_refs=False)
2184 except GitError as e: 2184 except GitError as e:
2185 print("Retrying clone after deleting %s" % force_sync, file=sys.stderr)
2186 if force_sync: 2185 if force_sync:
2186 print("Retrying clone after deleting %s" % self.gitdir, file=sys.stderr)
2187 try: 2187 try:
2188 shutil.rmtree(os.path.realpath(self.gitdir)) 2188 shutil.rmtree(os.path.realpath(self.gitdir))
2189 if self.worktree and os.path.exists( 2189 if self.worktree and os.path.exists(