Permalink
Browse files

Bug 559057, BumpFilePath failing to find for build > 1, r=nthomas

  • Loading branch information...
1 parent ad3aa68 commit 6361c10c992db5580436aa53137929aa1a386a10 @rail rail committed Jul 1, 2010
Showing with 2 additions and 2 deletions.
  1. +2 −2 release/patcher-config-bump.pl
@@ -148,12 +148,12 @@ sub BumpFilePath {
$newPath =~ s/.*\/build\d+\///;
# We need to handle partials and complete MARs differently
if ($newPath =~ m/\.partial\.mar$/) {
- $newPath =~ s/$oldMarName-.+?-($escapedOldVersion|$escapedVersion)\.
+ $newPath =~ s/($oldMarName|$marName)-.+?-($escapedOldVersion|$escapedVersion)\.
/$marName-$oldVersion-$version./x
or die("ASSERT: BumpFilePath() - Could not bump path: " .
"$oldFilePath");
} elsif ($newPath =~ m/\.complete\.mar$/) {
- $newPath =~ s/$oldMarName-($escapedOldVersion|$escapedVersion)\.
+ $newPath =~ s/($oldMarName|$marName)-($escapedOldVersion|$escapedVersion)\.
/$marName-$version./x
or die("ASSERT: BumpFilePath() - Could not bump path: " .
"$oldFilePath");

0 comments on commit 6361c10

Please sign in to comment.