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

…pdate mode. r=bhearsum
mozilla · Apr 7, 2010 · 26698ec · 26698ec
1 parent e7c79a9
commit 26698ec
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/release/update-verify-bump.pl b/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' .