Linux Archive

Linux Archive (http://www.linux-archive.org/)
-   Device-mapper Development (http://www.linux-archive.org/device-mapper-development/)
-   -   Fix: "Hookup new python EDD code" mismerge (http://www.linux-archive.org/device-mapper-development/345203-fix-hookup-new-python-edd-code-mismerge.html)

Hans de Goede 03-22-2010 11:22 AM

Fix: "Hookup new python EDD code" mismerge
 
This bit got missed due to commits getting added in a different order
on RHEL-6 branch (related #478996).
---
iw/cleardisks_gui.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/iw/cleardisks_gui.py b/iw/cleardisks_gui.py
index 72bf8bb..09812b1 100644
--- a/iw/cleardisks_gui.py
+++ b/iw/cleardisks_gui.py
@@ -143,7 +143,7 @@ class ClearDisksWindow (InstallWindow):
# Store the first disk (according to our detected BIOS order) for
# auto boot device selection
names = map(lambda d: d.name, disks)
- self.bootDisk = sorted(names, isys.compareDrives)[0]
+ self.bootDisk = sorted(names, self.anaconda.id.storage.compareDisks)[0]

# The device filtering UI set up exclusiveDisks as a list of the names
# of all the disks we should use later on. Now we need to go get those,
--
1.7.0

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

Chris Lumens 03-22-2010 01:21 PM

Fix: "Hookup new python EDD code" mismerge
 
> This bit got missed due to commits getting added in a different order
> on RHEL-6 branch (related #478996).

ACK.

- Chris

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list


All times are GMT. The time now is 03:41 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.