diff options
| author | Ben Kaduk <kaduk@mit.edu> | 2012-08-13 15:03:45 -0400 |
|---|---|---|
| committer | Ben Kaduk <kaduk@mit.edu> | 2012-08-29 14:50:21 -0400 |
| commit | 343c3c44dd96e7f8f58208b05b6074c140e193ba (patch) | |
| tree | f0782535b324b0514d1a2e11ba34cf577628a728 /src/windows | |
| parent | 12147e84b98422aec0f34abf6be254d11fe8729a (diff) | |
| download | krb5-343c3c44dd96e7f8f58208b05b6074c140e193ba.tar.gz krb5-343c3c44dd96e7f8f58208b05b6074c140e193ba.tar.xz krb5-343c3c44dd96e7f8f58208b05b6074c140e193ba.zip | |
Upgrade from KfW betas, too
Instead of using 3.9.9 as a conditional for the maximum version to
upgrade from, just use the current version.
This seems to pick up beta tags properly (so we can upgrade
from, e.g., beta 6 to beta 7 using the installer's upgrade tools),
and is future-proof.
Note that a 64-bit installer will not pick up an existing 32-bit
install (or vice versa), but there does not seem to be infrastructure
to deal with this situation easily.
Also, "downgrading" by running an older installer with a newer version
already installed will cause both versions to be simultaneously
installed; only do this if you know what you're doing.
ticket: 7334 (new)
queue: kfw
target_version: 1.10.4
tags: pullup
Diffstat (limited to 'src/windows')
| -rwxr-xr-x | src/windows/installer/wix/kfw.wxs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/windows/installer/wix/kfw.wxs b/src/windows/installer/wix/kfw.wxs index 74ef8ac0cf..c7b86ac9ea 100755 --- a/src/windows/installer/wix/kfw.wxs +++ b/src/windows/installer/wix/kfw.wxs @@ -194,7 +194,7 @@ <!-- KfW MSI --> <Upgrade Id="61211594-AAA1-4A98-A299-757326763CC7"> - <UpgradeVersion IgnoreRemoveFailure="no" IncludeMinimum="no" Maximum="3.9.9" IncludeMaximum="yes" MigrateFeatures="yes" Property="UPGRADEKFW" /> + <UpgradeVersion IgnoreRemoveFailure="no" IncludeMinimum="no" Maximum="$(var.VersionString)" IncludeMaximum="yes" MigrateFeatures="yes" Property="UPGRADEKFW" /> </Upgrade> <!-- NSIS installation --> |