|
diff -ru work/anaconda-13.21.176/iw/examine_gui.py work+patch/anaconda-13.21.176/iw/examine_gui.py |
|
|
--- work/anaconda-13.21.176/iw/examine_gui.py 2012-06-12 15:40:09.000000000 -0400 |
|
|
+++ work+patch/anaconda-13.21.176/iw/examine_gui.py 2012-10-05 11:13:35.000000000 -0400 |
|
|
@@ -142,7 +142,7 @@ |
|
|
self.upgradecombo.pack_start(cell, True) |
|
|
self.upgradecombo.set_attributes(cell, markup=0) |
|
|
|
|
|
- for (dev, desc) in self.parts: |
|
|
+ for (dev, desc, arch) in self.parts: |
|
|
iter = model.append() |
|
|
if (desc is None) or len(desc) < 1: |
|
|
desc = _("Unknown Linux system") |
|
1 |
diff -ru work/anaconda-13.21.176/rescue.py work+patch/anaconda-13.21.176/rescue.py |
diff -ru work/anaconda-13.21.176/rescue.py work+patch/anaconda-13.21.176/rescue.py |
2 |
--- work/anaconda-13.21.176/rescue.py 2012-06-12 15:40:09.000000000 -0400 |
--- work/anaconda-13.21.176/rescue.py 2012-06-12 15:40:09.000000000 -0400 |
3 |
+++ work+patch/anaconda-13.21.176/rescue.py 2012-10-05 11:12:56.000000000 -0400 |
+++ work+patch/anaconda-13.21.176/rescue.py 2012-10-05 11:12:56.000000000 -0400 |
10 |
if getattr(device.format, "label", None): |
if getattr(device.format, "label", None): |
11 |
devList.append("%s (%s) - %s" % (device.name, device.format.label, relstr)) |
devList.append("%s (%s) - %s" % (device.name, device.format.label, relstr)) |
12 |
else: |
else: |
13 |
diff -ru work/anaconda-13.21.176/storage/__init__.py work+patch/anaconda-13.21.176/storage/__init__.py |
diff -ru work/anaconda-13.21.215/storage/__init__.py work+patch/anaconda-13.21.215/storage/__init__.py |
14 |
--- work/anaconda-13.21.176/storage/__init__.py 2012-09-17 14:08:23.000000000 -0400 |
--- work/anaconda-13.21.215/storage/__init__.py 2014-01-02 10:16:53.197435613 -0500 |
15 |
+++ work+patch/anaconda-13.21.176/storage/__init__.py 2012-10-05 11:14:47.000000000 -0400 |
+++ work+patched/anaconda-13.21.215/storage/__init__.py 2014-01-02 10:16:53.208435558 -0500 |
16 |
@@ -1294,6 +1294,9 @@ |
@@ -1332,6 +1332,9 @@ |
17 |
def getReleaseString(mountpoint): |
def getReleaseString(mountpoint): |
18 |
relName = None |
relName = None |
19 |
relVer = None |
relVer = None |
23 |
|
|
24 |
filename = "%s/etc/redhat-release" % mountpoint |
filename = "%s/etc/redhat-release" % mountpoint |
25 |
if os.access(filename, os.R_OK): |
if os.access(filename, os.R_OK): |
26 |
@@ -1311,7 +1314,7 @@ |
@@ -1349,7 +1352,7 @@ |
27 |
relName = product |
relName = product |
28 |
relVer = version.split()[0] |
relVer = version.split()[0] |
29 |
|
|
32 |
|
|
33 |
def findExistingRootDevices(anaconda, upgradeany=False): |
def findExistingRootDevices(anaconda, upgradeany=False): |
34 |
""" Return a list of all root filesystems in the device tree. """ |
""" Return a list of all root filesystems in the device tree. """ |
35 |
@@ -1320,7 +1323,6 @@ |
@@ -1358,7 +1361,6 @@ |
36 |
if not os.path.exists(anaconda.rootPath): |
if not os.path.exists(anaconda.rootPath): |
37 |
iutil.mkdirChain(anaconda.rootPath) |
iutil.mkdirChain(anaconda.rootPath) |
38 |
|
|
40 |
for device in anaconda.id.storage.devicetree.leaves: |
for device in anaconda.id.storage.devicetree.leaves: |
41 |
if not device.format.linuxNative or not device.format.mountable: |
if not device.format.linuxNative or not device.format.mountable: |
42 |
continue |
continue |
43 |
@@ -1345,13 +1347,13 @@ |
@@ -1383,13 +1385,13 @@ |
44 |
continue |
continue |
45 |
|
|
46 |
if os.access(anaconda.rootPath + "/etc/fstab", os.R_OK): |
if os.access(anaconda.rootPath + "/etc/fstab", os.R_OK): |
153 |
[ TEXT_OK_BUTTON, |
[ TEXT_OK_BUTTON, |
154 |
TEXT_BACK_BUTTON ], |
TEXT_BACK_BUTTON ], |
155 |
width = 55, scroll = scroll, |
width = 55, scroll = scroll, |
156 |
|
--- work/anaconda-13.21.215/iw/examine_gui.py.orig 2013-08-02 09:47:00.000000000 -0400 |
157 |
|
+++ work/anaconda-13.21.215/iw/examine_gui.py 2014-01-03 16:42:55.686422730 -0500 |
158 |
|
@@ -139,7 +139,7 @@ |
159 |
|
self.upgradecombo.pack_start(cell, True) |
160 |
|
self.upgradecombo.set_attributes(cell, markup=0) |
161 |
|
|
162 |
|
- for (dev, desc) in self.parts: |
163 |
|
+ for (dev, desc, arch) in self.parts: |
164 |
|
iter = model.append() |
165 |
|
if (desc is None) or len(desc) < 1: |
166 |
|
desc = _("Unknown Linux system") |