From: Ben Kaduk Date: Mon, 13 Aug 2012 19:03:45 +0000 (-0400) Subject: Upgrade from KfW betas, too X-Git-Tag: kfw-4.0-final~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01e2b8d2a967a26a4cf77d0b578fcfdc97198acd;p=thirdparty%2Fkrb5.git 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. (cherry picked from commit 343c3c44dd96e7f8f58208b05b6074c140e193ba) ticket: 7334 status: resolved --- 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 @@ - +