diff options
| author | David Lehman <dlehman@redhat.com> | 2009-02-27 10:18:46 -0600 |
|---|---|---|
| committer | David Lehman <dlehman@redhat.com> | 2009-02-27 10:18:46 -0600 |
| commit | 77e052201c1aa258def5fdde5c9b8745b79611f2 (patch) | |
| tree | ebcdf7465fc944b97bd0b008a82cef0cb1d998ba /upgrade.py | |
| parent | addec40bb65f80a7f38166c5c87561d362b31fc9 (diff) | |
| download | anaconda-77e052201c1aa258def5fdde5c9b8745b79611f2.tar.gz anaconda-77e052201c1aa258def5fdde5c9b8745b79611f2.tar.xz anaconda-77e052201c1aa258def5fdde5c9b8745b79611f2.zip | |
Lots of minor fixes and cleanups. A non-exhaustive list follows.
- Change minsize/maxsize to minSize/maxSize since that's the
convention elsewhere throughout the code.
- Redirect output from all external utilities to tty5, not
/dev/null.
- Don't waste calls to basename for debug log statements,
especially when the device can be None.
- Add lots of missing imports.
- Fix lots of remnants of previous code usage.
Diffstat (limited to 'upgrade.py')
| -rw-r--r-- | upgrade.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/upgrade.py b/upgrade.py index f8e299626..c7e8efd5f 100644 --- a/upgrade.py +++ b/upgrade.py @@ -31,7 +31,8 @@ import selinux from flags import flags from constants import * from product import productName -from storage import findExistingRootDevices, FSSet +from storage import findExistingRootDevices +from storage import mountExistingSystem from storage.formats import getFormat import rhpl @@ -134,7 +135,7 @@ def findRootParts(anaconda): anaconda.id.upgradeRoot = [] for (dev, label) in anaconda.id.rootParts: - anaconda.id.upgradeRoot.append( (dev, fs) ) + anaconda.id.upgradeRoot.append( (dev, label) ) if anaconda.id.rootParts is not None and len(anaconda.id.rootParts) > 0: anaconda.dispatch.skipStep("findinstall", skip = 0) @@ -151,6 +152,7 @@ def findExistingRoots(anaconda, upgradeany = 0): return [(anaconda.rootPath, "")] return [] + rootparts = findExistingRootDevices(anaconda, upgradeany=upgradeany) return rootparts def bindMountDevDirectory(instPath): @@ -161,7 +163,7 @@ def bindMountDevDirectory(instPath): # returns None if no filesystem exist to migrate def upgradeMigrateFind(anaconda): - migents = anaconda.id.fsset.getMigratableEntries() + migents = anaconda.id.storage.fsset.getMigratableEntries() if not migents or len(migents) < 1: anaconda.dispatch.skipStep("upgrademigratefs") else: @@ -199,7 +201,7 @@ def upgradeSwapSuggestion(anaconda): fsList = [] - for device in anaconda.id.fsset.devices: + for device in anaconda.id.storage.fsset.devices: if not device.format: continue if device.format.mountable and device.format.linuxNative: |