Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

bug 454261: add Mercurial and long filename support to patcher - use …

…from_decoded instead of partial_decoded. r=nrthomas, patch=me
  • Loading branch information...
commit 32661706e946a0614e3c9619337f0fd5a9ef17a2 1 parent c0a2209
@bhearsum bhearsum authored
Showing with 2 additions and 3 deletions.
  1. +2 −3 tools/update-packaging/make_incremental_updates.py
View
5 tools/update-packaging/make_incremental_updates.py
@@ -388,7 +388,6 @@ def create_partial_patches(patches):
mar_extract_time = time.time()
partial_filename = create_partial_patch(work_dir_from, work_dir_to, patch_filename, shas, PatchInfo(work_dir, ['channel-prefs.js','update.manifest','removed-files'],['/readme.txt']))
- partial_decoded = decode_filename(partial_filename)
partial_buildid = to_buildid
partial_shasum = sha.sha(open(partial_filename).read()).hexdigest()
partial_size = str(os.path.getsize(partial_filename))
@@ -407,8 +406,8 @@ def create_partial_patches(patches):
'partial_size':partial_size,
'to_version':to_decoded['version'],
'from_version':from_decoded['version'],
- 'locale':partial_decoded['locale'],
- 'platform':partial_decoded['platform'],
+ 'locale':from_decoded['locale'],
+ 'platform':from_decoded['platform'],
})
print "done with patch %s/%s time (%.2fs/%.2fs/%.2fs) (mar/patch/total)" % (str(patch_num),str(len(patches)),mar_extract_time-startTime,time.time()-mar_extract_time,time.time()-startTime)
patch_num += 1

0 comments on commit 3266170

Please sign in to comment.
Something went wrong with that request. Please try again.