Permalink
Browse files

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

  • Loading branch information...
1 parent 46d399b commit 7385967f035e5d4e59e31b0c215e4cb3d90b5ed8 Robert Strong committed May 19, 2011
Showing with 8 additions and 2 deletions.
  1. +1 −1 tools/update-packaging/common.sh
  2. +7 −1 tools/update-packaging/make_incremental_updates.py
View
2 tools/update-packaging/common.sh
@@ -108,7 +108,7 @@ append_remove_instructions() {
fixedprefix=""
else
f=$(echo $f | sed -e 's:^\.\.\/::')
- fixedprefix=$(echo "$prefix" | sed -e 's:^[^\/]*\/::')
+ fixedprefix=$(echo "$prefix" | sed -e 's:[^\/]*\/$::')
fi
fi
fi
View
8 tools/update-packaging/make_incremental_updates.py
@@ -302,9 +302,15 @@ def process_explicit_remove_files(dir_path, patch_info):
for line in lines:
# Exclude any blank and comment lines.
if line and not line.startswith("#"):
+ if prefix != "":
+ if line.startswith("../"):
+ line = line.replace("../../", "")
+ line = line.replace("../", "Contents/")
+ else:
+ line = os.path.join(prefix,line)
# Python on windows uses \ for path separators and the update
# manifests expects / for path separators on all platforms.
- line=os.path.join(prefix,line).replace("\\", "/")
+ line = line.replace("\\", "/")
patch_info.append_remove_instruction(line)
def create_partial_patch(from_dir_path, to_dir_path, patch_filename, shas, patch_info, forced_updates):

0 comments on commit 7385967

Please sign in to comment.