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

Fix percent done on resumed /clone.bundle

Browse Source 
The Content-Length when resuming is the number of bytes that
remain in the file. To compute the total size as expected by
the progress meter, we must add the bytes already stored.

While we are in this method fix uses of % operator to ensure
a tuple is always supplied.

Change-Id: Ic899231b5bc0ab43b3ddb1d29845f6390e820115
This commit is contained in:
Shawn O. Pearce 2012-08-01 17:41:26 -07:00
parent 2bc7f5cb3a
commit 9830553748
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
project.py
View File

@ -1564,7 +1564,7 @@ class Project(object):
try: try:
req = urllib2.Request(srcUrl) req = urllib2.Request(srcUrl)
if pos > 0: if pos > 0:
req.add_header('Range', 'bytes=%d-' % pos) req.add_header('Range', 'bytes=%d-' % (pos,))
try: try:
r = urllib2.urlopen(req) r = urllib2.urlopen(req)
@ -1583,7 +1583,7 @@ class Project(object):
msg = e.read() msg = e.read()
if len(msg) > 0 and msg[-1] == '\n': if len(msg) > 0 and msg[-1] == '\n':
msg = msg[0:-1] msg = msg[0:-1]
msg = ' (%s)' % msg msg = ' (%s)' % (msg,)
except: except:
msg = '' msg = ''
else: else:
@ -1601,7 +1601,7 @@ class Project(object):
p = None p = None
try: try:
size = r.headers.get('content-length', 0) size = pos + r.headers.get('content-length', 0)
unit = 1 << 10 unit = 1 << 10
if size and not quiet: if size and not quiet:
@ -1611,7 +1611,7 @@ class Project(object):
else: else:
desc = 'KB' desc = 'KB'
p = Progress( p = Progress(
'Downloading %s' % self.relpath, 'Downloading %s' % (self.relpath,),
int(size) / unit, int(size) / unit,
units=desc) units=desc)
if pos > 0: if pos > 0: