summaryrefslogtreecommitdiffstats
path: root/upgrade.py
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2009-03-24 14:08:25 -0400
committerChris Lumens <clumens@redhat.com>2009-03-24 16:48:46 -0400
commit04eb28ce07b81487c0271a9ff498a56a7b4895ee (patch)
treee94983c29eb3089516a408d354a7b6f4d6bf191f /upgrade.py
parent1392aa0641e2482056c5e89711a7b8065d49b133 (diff)
downloadanaconda-04eb28ce07b81487c0271a9ff498a56a7b4895ee.tar.gz
anaconda-04eb28ce07b81487c0271a9ff498a56a7b4895ee.tar.xz
anaconda-04eb28ce07b81487c0271a9ff498a56a7b4895ee.zip
Move most of the parseFSTab logic into its own function.
The purpose of doing this is so we can start to get a better handle on what line causes an error, so the user has some way to tell what they need to change in their /etc/fstab to make it work.
Diffstat (limited to 'upgrade.py')
-rw-r--r--upgrade.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/upgrade.py b/upgrade.py
index c080c8651..be701fb24 100644
--- a/upgrade.py
+++ b/upgrade.py
@@ -234,11 +234,12 @@ def upgradeMountFilesystems(anaconda):
mountExistingSystem(anaconda,
anaconda.id.upgradeRoot[0],
allowDirty = 0)
- except Exception:
+ except ValueError as e:
+ log.error("Error mounting filesystem: %s" % e)
anaconda.intf.messageWindow(_("Mount failed"),
- _("One or more of the file systems listed in the "
- "/etc/fstab on your Linux system cannot be mounted. "
- "Please fix this problem and try to upgrade again."))
+ _("The following error occurred when mounting the file "
+ "systems listed in /etc/fstab. Please fix this problem "
+ "and try to upgrade again.\n%s" % e))
sys.exit(0)
checkLinks = ( '/etc', '/var', '/var/lib', '/var/lib/rpm',