1 |
wellsi |
1.1 |
diff -ruN anaconda-13.21.215.p14/yuminstall.py anaconda-13.21.215/yuminstall.py |
2 |
|
|
--- anaconda-13.21.215.p14/yuminstall.py 2014-03-17 20:10:34.000000000 -0700 |
3 |
|
|
+++ anaconda-13.21.215/yuminstall.py 2014-03-17 20:59:10.000000000 -0700 |
4 |
|
|
@@ -1825,7 +1825,7 @@ |
5 |
|
|
# Figure out current version for upgrade nag and for determining weird |
6 |
|
|
# upgrade cases |
7 |
|
|
supportedUpgradeVersion = -1 |
8 |
|
|
- for pkgtup in self.ayum.rpmdb.whatProvides('redhat-release', None, None): |
9 |
|
|
+ for pkgtup in self.ayum.rpmdb.whatProvides('smeserver-release', None, None): |
10 |
|
|
n, a, e, v, r = pkgtup |
11 |
|
|
if supportedUpgradeVersion <= 0: |
12 |
|
|
val = rpmUtils.miscutils.compareEVR((None, '9.0', '1'), |
13 |
|
|
@@ -1836,9 +1836,6 @@ |
14 |
|
|
supportedUpgradeVersion = 1 |
15 |
|
|
break |
16 |
|
|
|
17 |
|
|
- if "SME Server" not in productName: |
18 |
|
|
- supportedUpgradeVersion = 1 |
19 |
|
|
- |
20 |
|
|
if supportedUpgradeVersion == 0: |
21 |
|
|
rc = anaconda.intf.messageWindow(_("Warning"), |
22 |
|
|
_("You appear to be upgrading from a system " |