Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Bug 658094 - Partial updates for 5.0b1 on Mac fail. r=nrthomas

  • Loading branch information...
commit 5e2f0e6dd8eb4bc3fcf3b5e38ea10220993abf57 1 parent 9832436
Robert Strong authored
2  tools/update-packaging/common.sh
@@ -108,7 +108,7 @@ append_remove_instructions() {
108 108 fixedprefix=""
109 109 else
110 110 f=$(echo $f | sed -e 's:^\.\.\/::')
111   - fixedprefix=$(echo "$prefix" | sed -e 's:^[^\/]*\/::')
  111 + fixedprefix=$(echo "$prefix" | sed -e 's:[^\/]*\/$::')
112 112 fi
113 113 fi
114 114 fi
8 tools/update-packaging/make_incremental_updates.py
@@ -302,9 +302,15 @@ def process_explicit_remove_files(dir_path, patch_info):
302 302 for line in lines:
303 303 # Exclude any blank and comment lines.
304 304 if line and not line.startswith("#"):
  305 + if prefix != "":
  306 + if line.startswith("../"):
  307 + line = line.replace("../../", "")
  308 + line = line.replace("../", "Contents/")
  309 + else:
  310 + line = os.path.join(prefix,line)
305 311 # Python on windows uses \ for path separators and the update
306 312 # manifests expects / for path separators on all platforms.
307   - line=os.path.join(prefix,line).replace("\\", "/")
  313 + line = line.replace("\\", "/")
308 314 patch_info.append_remove_instruction(line)
309 315
310 316 def create_partial_patch(from_dir_path, to_dir_path, patch_filename, shas, patch_info, forced_updates):

0 comments on commit 5e2f0e6

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