1 |
wellsi |
1.1 |
--- anaconda-13.21.195.upstream/upgrade.py 2012-11-26 12:42:03.000000000 -0800 |
2 |
|
|
+++ updates/upgrade.py 2013-03-11 11:03:05.000000000 -0700 |
3 |
|
|
@@ -84,7 +84,7 @@ |
4 |
|
|
|
5 |
|
|
if anaconda.id.rootParts is not None and len(anaconda.id.rootParts) > 0: |
6 |
|
|
anaconda.dispatch.skipStep("findinstall", skip = 0) |
7 |
|
|
- if productName.find("Red Hat Enterprise Linux") == -1: |
8 |
|
|
+ if productName.find("SME Server") == -1: |
9 |
|
|
anaconda.dispatch.skipStep("installtype", skip = 1) |
10 |
|
|
else: |
11 |
|
|
anaconda.dispatch.skipStep("findinstall", skip = 1) |
12 |
|
|
--- anaconda-13.21.195.upstream/yuminstall.py 2012-11-29 09:42:25.000000000 -0800 |
13 |
|
|
+++ updates/yuminstall.py 2013-03-11 11:03:05.000000000 -0700 |
14 |
|
|
@@ -1815,7 +1815,7 @@ |
15 |
|
|
for pkgtup in self.ayum.rpmdb.whatProvides('redhat-release', None, None): |
16 |
|
|
n, a, e, v, r = pkgtup |
17 |
|
|
if supportedUpgradeVersion <= 0: |
18 |
|
|
- val = rpmUtils.miscutils.compareEVR((None, '3', '1'), |
19 |
|
|
+ val = rpmUtils.miscutils.compareEVR((None, '9.0', '1'), |
20 |
|
|
(e, v,r)) |
21 |
|
|
if val > 0: |
22 |
|
|
supportedUpgradeVersion = 0 |
23 |
|
|
@@ -1823,7 +1823,7 @@ |
24 |
|
|
supportedUpgradeVersion = 1 |
25 |
|
|
break |
26 |
|
|
|
27 |
|
|
- if "Red Hat Enterprise Linux" not in productName: |
28 |
|
|
+ if "SME Server" not in productName: |
29 |
|
|
supportedUpgradeVersion = 1 |
30 |
|
|
|
31 |
|
|
if supportedUpgradeVersion == 0: |