wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 387970: _M5 regression issues; fix the PatcherConfig bug where to/from/past-updates stanzas of the config don't get updated if we were on RC > 1, but hadn't run updates yet. r=cf, r=rhelmer

Browse Source
This commit is contained in:
preed@mozilla.com 2007-08-15 17:16:59 -07:00
parent 2a39fb4759
commit 35a7b673a8
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/release/Bootstrap/Step/PatcherConfig.pm
View File

@ -105,12 +105,18 @@ sub BumpPatcherConfig {
my $currentUpdateObj = $appObj->{'current-update'};
# Add the release we're replacing to the past-releases array, but only if
# it's not a respin...
# it's a new release; we used to determine this by looking at the rc
# value, but that can be misleading because sometimes we may not get to
# the update step before a respin; so what we really need to compare is
# whether our current version in bootstrap.cfg is in the to clause of the
# patcher config file/object; we now control this via doOnetimePatcherBumps.
#
# More complicated than it needs to be because it handles the (uncommon)
# case that there is no past-update yet (e.g. Firefox 3.0)
if (1 == int($rc)) {
my $doOnetimePatcherBumps = ($currentUpdateObj->{'to'} ne $version);
if ($doOnetimePatcherBumps) {
my $pastUpdateObj = $appObj->{'past-update'};
if (ref($pastUpdateObj) ne 'ARRAY') {
my $oldSinglePastUpdateStr = $pastUpdateObj;
@ -127,15 +133,15 @@ sub BumpPatcherConfig {
$currentUpdateObj->{'to'}, @pastUpdateChannels));
}
# Now we can replace information in the "current-update" object; start
# with the to/from versions, the rc channels, then the information for
# the partial and complete update patches
#
# Only bump the to/from versions if we're really a new release.
# Only bump the to/from versions if we're really a new release. We used
# to determine this by looking at the rc value, but now we use
# doOnetimePatcherBump
if (1 == int($rc)) {
if ($doOnetimePatcherBumps) {
$currentUpdateObj->{'to'} = $version;
$currentUpdateObj->{'from'} = $oldVersion;
}