android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Silence warnings about invalid clone.bundle files when quieted

Browse Source 
The invalid clone.bundle file warning is not typically user actionable,
and can be confusing. So don't show it when -q flag is in effect.

Change-Id: If9fef4085391acf54b63c75029ec0e161c38eb86
This commit is contained in:
Kris Giesing 2014-12-23 13:02:32 -08:00 committed by David Pursehouse
parent 3eb87cec5c
commit c8d882ae2a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
project.py
View File

@ -1973,7 +1973,7 @@ class Project(object):
return False return False
if os.path.exists(tmpPath): if os.path.exists(tmpPath):
if curlret == 0 and self._IsValidBundle(tmpPath): if curlret == 0 and self._IsValidBundle(tmpPath, quiet):
os.rename(tmpPath, dstPath) os.rename(tmpPath, dstPath)
return True return True
else: else:
@ -1982,13 +1982,14 @@ class Project(object):
else: else:
return False return False
def _IsValidBundle(self, path): def _IsValidBundle(self, path, quiet):
try: try:
with open(path) as f: with open(path) as f:
if f.read(16) == '# v2 git bundle\n': if f.read(16) == '# v2 git bundle\n':
return True return True
else: else:
print("Invalid clone.bundle file; ignoring.", file=sys.stderr) if not quiet:
print("Invalid clone.bundle file; ignoring.", file=sys.stderr)
return False return False
except OSError: except OSError:
return False return False