зеркало из https://github.com/mozilla/pjs.git
Bug 371062: Fix two regressions with past release update snippet handling. r=rhelmer
This commit is contained in:
Родитель
2f9e0c642c
Коммит
91a6fab74f
|
@ -901,7 +901,6 @@ sub CreatePastReleasePatchinfo {
|
||||||
$completePatch ->{'info_path'} = catfile($ausPrefix,
|
$completePatch ->{'info_path'} = catfile($ausPrefix,
|
||||||
'complete.txt');
|
'complete.txt');
|
||||||
|
|
||||||
|
|
||||||
my $prettyPrefix = "$pastUpd->{'from'}-$update->{'to'}";
|
my $prettyPrefix = "$pastUpd->{'from'}-$update->{'to'}";
|
||||||
PrintProgress(total => $totalPastUpdates,
|
PrintProgress(total => $totalPastUpdates,
|
||||||
current => ++$patchInfoFilesCreated,
|
current => ++$patchInfoFilesCreated,
|
||||||
|
@ -920,13 +919,13 @@ sub CreatePastReleasePatchinfo {
|
||||||
$completePatch->{'build_id'} = $patchLocaleNode->{'build_id'};
|
$completePatch->{'build_id'} = $patchLocaleNode->{'build_id'};
|
||||||
$completePatch->{'appv'} = $patchLocaleNode->{'appv'};
|
$completePatch->{'appv'} = $patchLocaleNode->{'appv'};
|
||||||
$completePatch->{'extv'} = $patchLocaleNode->{'extv'};
|
$completePatch->{'extv'} = $patchLocaleNode->{'extv'};
|
||||||
$completePatch->{'size'} = (stat($to_path))[$MozAUSLib::ST_SIZE];
|
$completePatch->{'size'} = (stat($to_path))[$ST_SIZE];
|
||||||
|
|
||||||
my $channelSpecificUrlKey = $channel . '-url';
|
my $channelSpecificUrlKey = $channel . '-url';
|
||||||
|
|
||||||
if (exists($completePatch->{$channelSpecificUrlKey})) {
|
if (exists($complete->{$channelSpecificUrlKey})) {
|
||||||
$completePatch->{'url'} = SubstitutePath(
|
$completePatch->{'url'} = SubstitutePath(
|
||||||
path => $completePatch->{$channelSpecificUrlKey},
|
path => $complete->{$channelSpecificUrlKey},
|
||||||
platform => $toPlatform,
|
platform => $toPlatform,
|
||||||
locale => $locale);
|
locale => $locale);
|
||||||
} else {
|
} else {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче