Browse files

bug 553052: update-verify-bump.pl shouldn't use /releases/ in major u…

…pdate mode. r=bhearsum
  • Loading branch information...
1 parent e7c79a9 commit 26698ec6717ecf44c2a91e4e5ff8e1f2e8b6327d @rail rail committed Apr 7, 2010
Showing with 9 additions and 2 deletions.
  1. +9 −2 release/update-verify-bump.pl
View
11 release/update-verify-bump.pl
@@ -255,12 +255,19 @@ sub BumpVerifyConfig {
}
# add data for latest release
+ my $from = '/' . $product . '/releases/' . $oldVersion . '/' . $ftpOsname .
+ '/%locale%/' . $releaseFile;
+ if ( $majorMode ) {
+ my $candidatesDirStripped = $candidatesDir;
+ $candidatesDirStripped =~ s!/$!!; # Remove trailing slash
+ $candidatesDirStripped =~ s!^/.*?/$product/!/$product/!; # Remove FTP prefix
+ $from = $candidatesDirStripped . '/' . $ftpOsname . '/%locale%/' . $releaseFile;
+ }
my @data = ("# $oldVersion $osname\n",
'release="' . $oldAppVersion . '" product="' . $brand .
'" platform="' .$buildTarget . '" build_id="' . $buildID .
'" locales="' . join(' ', sort(@locales)) . '" channel="' .
- $channel . '" from="/' . $product . '/releases/' .
- $oldVersion . '/' . $ftpOsname . '/%locale%/' . $releaseFile .
+ $channel . '" from="' . $from .
'" aus_server="' . $ausServerUrl . '" ftp_server="' .
$stagingServer . '/pub/mozilla.org" to="/' .
$product . '/nightly/' . $version . '-candidates/build' .

0 comments on commit 26698ec

Please sign in to comment.