From 5d2c3284b29fe6ee7e247ec73ddc03bd787fe2d5 Mon Sep 17 00:00:00 2001
From: "bhearsum@mozilla.com" <bhearsum@mozilla.com>
Date: Mon, 10 Mar 2008 10:42:47 -0700
Subject: [PATCH] bug 420947: patcher should use 'prettyVersion' in the update
 dialog (appv) and 'version' for everything else. r=nrthomas, patch=me

---
 tools/patcher/MozAUSConfig.pm |  8 ++++++++
 tools/patcher/patcher2.pl     | 29 ++++++++++++++++++++++++-----
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/tools/patcher/MozAUSConfig.pm b/tools/patcher/MozAUSConfig.pm
index f6c04ffef84..bf946a5bd21 100644
--- a/tools/patcher/MozAUSConfig.pm
+++ b/tools/patcher/MozAUSConfig.pm
@@ -535,6 +535,7 @@ sub CreateUpdateGraph
                      locale => $l,
                      build_id => $rlp_config->{$p}->{'build_id'},
                      version => $rl_config->{'version'},
+                     prettyVersion => $rl_config->{'prettyVersion'},
                      extensionVersion => $rl_config->{'extension-version'},
                      schemaVersion => $rl_config->{'schema'} );
                 }
@@ -556,6 +557,7 @@ sub GatherCompleteData
     my $release = $args{'release'};
     my $build_id = $args{'build_id'};
     my $version = $args{'version'};
+    my $prettyVersion = $args{'prettyVersion'};
     my $extensionVersion = $args{'extensionVersion'};
     my $schemaVersion = $args{'schemaVersion'};
 
@@ -600,6 +602,12 @@ sub GatherCompleteData
     $numericVersion =~ s/\-.*$//;
     $node->{'appv'} = $numericVersion;
 
+    # appv is used for directory creation and possibly other things.
+    # patcher will use prettyAppv in the snippets it creates, and appv for any
+    # other weird things it chooses to use it for
+    $node->{'prettyAppv'} = defined($prettyVersion) ?
+     $prettyVersion : $numericVersion;
+
     # Most of the time, the extv should be the same as the appv; sometimes,
     # however, this won't be the case. This adds support to allow you to specify
     # an extv that is different from the appv. 
diff --git a/tools/patcher/patcher2.pl b/tools/patcher/patcher2.pl
index 172d2900036..71b8b9d1e1f 100755
--- a/tools/patcher/patcher2.pl
+++ b/tools/patcher/patcher2.pl
@@ -708,10 +708,13 @@ sub CreateCompletePatchinfo {
                      config => $config->GetCurrentUpdate(), channel => $c);
 
                     my $snippetToAppVersion = $to->{'appv'};
+                    my $prettySnippetToAppVersion = $to->{'prettyAppv'};
                     foreach my $channel (keys(%{$currentUpdateRcInfo})) {
                         if ($c eq $channel) {
                             $snippetToAppVersion = $to->{'appv'} . 'rc' .
                              $currentUpdateRcInfo->{$channel};
+                            $prettySnippetToAppVersion = $to->{'prettyAppv'} .
+                             'rc' . $currentUpdateRcInfo->{$channel};
                             last;
                         }
                     }
@@ -756,7 +759,7 @@ sub CreateCompletePatchinfo {
                     $complete_patch->{'hash_value'} =~ s/^(\S+)\s+.*$/$1/g;
 
                     $complete_patch->{'build_id'} = $to->{'build_id'};
-                    $complete_patch->{'appv'} = $snippetToAppVersion;
+                    $complete_patch->{'appv'} = $prettySnippetToAppVersion;
                     $complete_patch->{'extv'} = $to->{'extv'};
                     $complete_patch->{'size'} = (stat($to_path))[$ST_SIZE];
 
@@ -797,11 +800,15 @@ sub CreateCompletePatchinfo {
                          $u_config->{$u}->{'testchannel'})) {
                     
                             $snippetToAppVersion = $to->{'appv'};
+                            $prettySnippetToAppVersion = $to->{'prettyAppv'};
                             foreach my $channel 
                              (keys(%{$currentUpdateRcInfo})) {
                                 if ($testChan eq $channel) {
                                     $snippetToAppVersion = $to->{'appv'} . 'rc' 
                                     . $currentUpdateRcInfo->{$channel};
+                                    $prettySnippetToAppVersion =
+                                     $to->{'prettyAppv'} . 'rc' .
+                                     $currentUpdateRcInfo->{$channel};
                                     last;
                                 }
                             }
@@ -812,7 +819,7 @@ sub CreateCompletePatchinfo {
                             # want the snippet to have the rc value for its
                             # appv, but not for any of the other places where
                             # we use version.
-                            $testPatch->{'appv'} = $snippetToAppVersion;
+                            $testPatch->{'appv'} = $prettySnippetToAppVersion;
 
                             my $snippetDir = GetSnippetDirFromChannel(
                              config => $u_config->{$u}, channel => $testChan);
@@ -970,10 +977,15 @@ sub CreatePastReleasePatchinfo {
                      $config->GetCurrentUpdate(), channel => $channel);
                   
                     my $snippetToAppVersion = $patchLocaleNode->{'appv'};
+                    my $prettySnippetToAppVersion =
+                     $patchLocaleNode->{'prettyAppv'};
                     foreach my $rcChan (keys(%{$currentReleaseRcInfo})) {
                         if ($rcChan eq $channel) {
                             $snippetToAppVersion = $patchLocaleNode->{'appv'} .
                              'rc' . $currentReleaseRcInfo->{$channel};
+                            $prettySnippetToAppVersion =
+                             $patchLocaleNode->{'prettyAppv'} . 'rc' .
+                             $currentReleaseRcInfo->{$channel};
                             last;
                         }
                     }
@@ -1009,7 +1021,7 @@ sub CreatePastReleasePatchinfo {
                                                       file => $to_path,
                                                       type => $hash_type);
                     $completePatch->{'build_id'} = $patchLocaleNode->{'build_id'};
-                    $completePatch->{'appv'} = $snippetToAppVersion;
+                    $completePatch->{'appv'} = $prettySnippetToAppVersion;
                     $completePatch->{'extv'} = $patchLocaleNode->{'extv'};
                     $completePatch->{'size'} = (stat($to_path))[$ST_SIZE];
 
@@ -1190,10 +1202,13 @@ sub CreatePartialPatchinfo {
                      $u_config->{$u}, channel => $c);
 
                     my $snippetToAppVersion = $to->{'appv'};
+                    my $prettySnippetToAppVersion = $to->{'prettyAppv'};
                     foreach my $channel (keys(%{$currentUpdateRcInfo})) {
                         if ($c eq $channel) {
                             $snippetToAppVersion = $to->{'appv'} . 'rc' .
                              $currentUpdateRcInfo->{$channel};
+                            $prettySnippetToAppVersion = $to->{'prettyAppv'} .
+                             'rc' . $currentUpdateRcInfo->{$channel};
 
                             $serveCompleteUpdateToRcs =
                              (!$disableCompleteJumpForRcs) &&
@@ -1241,7 +1256,7 @@ sub CreatePartialPatchinfo {
                     $partial_patch->{'hash_value'} = $serveCompleteUpdateToRcs ?
                      $completePatchHash : $partialPatchHash;
                     $partial_patch->{'build_id'} = $to->{'build_id'};
-                    $partial_patch->{'appv'} = $snippetToAppVersion;
+                    $partial_patch->{'appv'} = $prettySnippetToAppVersion;
                     $partial_patch->{'extv'} = $to->{'extv'};
                     $partial_patch->{'size'} = $serveCompleteUpdateToRcs ?
                      $completePatchSize : $partialPatchSize;
@@ -1302,11 +1317,15 @@ sub CreatePartialPatchinfo {
                             $testPatch->{'hash_value'} = $testPatchHash;
 
                             $snippetToAppVersion = $to->{'appv'};
+                            $prettySnippetToAppVersion = $to->{'prettyAppv'};
                             foreach my $channel 
                              (keys(%{$currentUpdateRcInfo})) {
                                 if ($testChan eq $channel) {
                                     $snippetToAppVersion = $to->{'appv'} . 'rc'
                                      . $currentUpdateRcInfo->{$channel};
+                                    $prettySnippetToAppVersion =
+                                     $to->{'prettyAppv'} . 'rc' .
+                                     $currentUpdateRcInfo->{$channel};
                                     last;
                                 }
                             }
@@ -1317,7 +1336,7 @@ sub CreatePartialPatchinfo {
                             # want the snippet to have the rc value for its
                             # appv, but not for any of the other places where
                             # we use version.
-                            $testPatch->{'appv'} = $snippetToAppVersion;
+                            $testPatch->{'appv'} = $prettySnippetToAppVersion;
 
                             my $snippetDir = GetSnippetDirFromChannel(config =>
                              $u_config->{$u}, channel => $testChan);