Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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 162d17d235fe9da3f7054e18ce7e4a07cb76310e 1 parent 4d5942f
authored October 17, 2008
5  tools/update-packaging/make_incremental_updates.py
@@ -388,7 +388,6 @@ def create_partial_patches(patches):
388 388
             mar_extract_time = time.time()
389 389
 
390 390
             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']))
391  
-            partial_decoded = decode_filename(partial_filename)
392 391
             partial_buildid = to_buildid
393 392
             partial_shasum = sha.sha(open(partial_filename).read()).hexdigest()
394 393
             partial_size = str(os.path.getsize(partial_filename))
@@ -407,8 +406,8 @@ def create_partial_patches(patches):
407 406
              'partial_size':partial_size,
408 407
              'to_version':to_decoded['version'],
409 408
              'from_version':from_decoded['version'],
410  
-             'locale':partial_decoded['locale'],
411  
-             'platform':partial_decoded['platform'],
  409
+             'locale':from_decoded['locale'],
  410
+             'platform':from_decoded['platform'],
412 411
             })
413 412
             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)
414 413
             patch_num += 1

0 notes on commit 162d17d

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