diff options
| author | Mike Fulbright <msf@redhat.com> | 2001-07-10 03:49:09 +0000 |
|---|---|---|
| committer | Mike Fulbright <msf@redhat.com> | 2001-07-10 03:49:09 +0000 |
| commit | bb175f4b79da791751fcfb5aab18f19c3b37b86e (patch) | |
| tree | a581ac571acd173b23ea2227e2c51f10f2ef55bd | |
| parent | f879cf8b0cfc1633e24e4c3d4f60d2888fc7288a (diff) | |
| download | anaconda-bb175f4b79da791751fcfb5aab18f19c3b37b86e.tar.gz anaconda-bb175f4b79da791751fcfb5aab18f19c3b37b86e.tar.xz anaconda-bb175f4b79da791751fcfb5aab18f19c3b37b86e.zip | |
report mount point correctly when querying about migrating fs on upgrade
| -rw-r--r-- | dispatch.py | 2 | ||||
| -rw-r--r-- | iw/upgrade_migratefs_gui.py | 10 | ||||
| -rw-r--r-- | textw/upgrade_text.py | 11 |
3 files changed, 18 insertions, 5 deletions
diff --git a/dispatch.py b/dispatch.py index 2f810cd6e..20f35450e 100644 --- a/dispatch.py +++ b/dispatch.py @@ -68,7 +68,7 @@ installSteps = [ "id.fsset", "id.diskset", "id.partitions") ), ( "upgrademigfind", upgradeMigrateFind, ("dispatch", "id.partitions")), - ( "upgrademigratefs", ("id.partitions",) ), + ( "upgrademigratefs", ("id.fsset", "id.partitions",) ), ( "bootloadersetup", bootloaderSetupChoices, ("dispatch", "id.bootloader", "id.fsset", "id.diskset", "dir") ), diff --git a/iw/upgrade_migratefs_gui.py b/iw/upgrade_migratefs_gui.py index 111b89c79..9018aec95 100644 --- a/iw/upgrade_migratefs_gui.py +++ b/iw/upgrade_migratefs_gui.py @@ -44,7 +44,7 @@ class UpgradeMigrateFSWindow (InstallWindow): return None - def getScreen (self, partitions): + def getScreen (self, fsset, partitions): self.migratereq = partitions.getMigratableRequests() @@ -72,9 +72,15 @@ class UpgradeMigrateFSWindow (InstallWindow): else: migrating = 0 + entry = fsset.getEntryByDeviceName(req.device) + if not entry: + mntpt = "" + else: + mntpt =entry.mountpoint + cb = GtkCheckButton("%s - %s - %s" % (req.device, req.origfstype.getName(), - req.mountpoint)) + mntpt)) cb.set_active(migrating) cbox.pack_start(cb, FALSE) diff --git a/textw/upgrade_text.py b/textw/upgrade_text.py index 7670247a5..02ff54ce1 100644 --- a/textw/upgrade_text.py +++ b/textw/upgrade_text.py @@ -23,7 +23,7 @@ from flags import flags from translate import _ class UpgradeMigrateFSWindow: - def __call__ (self, screen, partitions): + def __call__ (self, screen, fsset, partitions): migratereq = partitions.getMigratableRequests() @@ -45,9 +45,16 @@ class UpgradeMigrateFSWindow: migrating = 1 else: migrating = 0 + + entry = fsset.getEntryByDeviceName(req.device) + if not entry: + mntpt = "" + else: + mntpt =entry.mountpoint + partlist.append("%s - %s - %s" % (req.device, req.origfstype.getName(), - req.mountpoint), req, migrating) + mntpt), req, migrating) g.add(partlist, 0, 1, padding = (0, 0, 0, 1)) |