1 |
From b07e527a8e3e700c9b3bc76f2abd0d2268eb060b Mon Sep 17 00:00:00 2001 |
From 325e7cfea669b42ee655f18a5c52d063b9d8ea92 Mon Sep 17 00:00:00 2001 |
2 |
From: Shad L. Lords <slords@mail.com> |
From: Shad L. Lords <slords@mail.com> |
3 |
Date: Mon, 19 Oct 2009 08:43:46 -0600 |
Date: Mon, 19 Oct 2009 08:43:46 -0600 |
4 |
Subject: [PATCH] Determine upgradability of SME server |
Subject: [PATCH 15/17] Determine upgradability of SME server |
5 |
|
|
6 |
--- |
--- |
7 |
partedUtils.py | 1 + |
partedUtils.py | 1 + |
11 |
4 files changed, 11 insertions(+), 20 deletions(-) |
4 files changed, 11 insertions(+), 20 deletions(-) |
12 |
|
|
13 |
diff --git a/partedUtils.py b/partedUtils.py |
diff --git a/partedUtils.py b/partedUtils.py |
14 |
index a9d9e0d..6fa73cb 100644 |
index 2a2d034..2dfe638 100644 |
15 |
--- a/partedUtils.py |
--- a/partedUtils.py |
16 |
+++ b/partedUtils.py |
+++ b/partedUtils.py |
17 |
@@ -571,6 +571,7 @@ def productMatches(oldproduct, newproduct): |
@@ -571,6 +571,7 @@ def productMatches(oldproduct, newproduct): |
83 |
else: |
else: |
84 |
anaconda.dispatch.skipStep("findinstall", skip = 1) |
anaconda.dispatch.skipStep("findinstall", skip = 1) |
85 |
diff --git a/yuminstall.py b/yuminstall.py |
diff --git a/yuminstall.py b/yuminstall.py |
86 |
index ede099a..9f8a499 100644 |
index 8505120..6f405fa 100644 |
87 |
--- a/yuminstall.py |
--- a/yuminstall.py |
88 |
+++ b/yuminstall.py |
+++ b/yuminstall.py |
89 |
@@ -1634,10 +1634,10 @@ class YumBackend(AnacondaBackend): |
@@ -1675,10 +1675,10 @@ class YumBackend(AnacondaBackend): |
90 |
# Figure out current version for upgrade nag and for determining weird |
# Figure out current version for upgrade nag and for determining weird |
91 |
# upgrade cases |
# upgrade cases |
92 |
supportedUpgradeVersion = -1 |
supportedUpgradeVersion = -1 |
99 |
(e, v,r)) |
(e, v,r)) |
100 |
if val > 0: |
if val > 0: |
101 |
supportedUpgradeVersion = 0 |
supportedUpgradeVersion = 0 |
102 |
@@ -1645,9 +1645,6 @@ class YumBackend(AnacondaBackend): |
@@ -1686,9 +1686,6 @@ class YumBackend(AnacondaBackend): |
103 |
supportedUpgradeVersion = 1 |
supportedUpgradeVersion = 1 |
104 |
break |
break |
105 |
|
|
110 |
rc = anaconda.intf.messageWindow(_("Warning"), |
rc = anaconda.intf.messageWindow(_("Warning"), |
111 |
_("You appear to be upgrading from a system " |
_("You appear to be upgrading from a system " |
112 |
-- |
-- |
113 |
1.5.5.6 |
1.7.4.1 |
114 |
|
|