summaryrefslogtreecommitdiffstats
path: root/upgrade.py
diff options
context:
space:
mode:
authorMatt Wilson <msw@redhat.com>2001-06-22 23:56:28 +0000
committerMatt Wilson <msw@redhat.com>2001-06-22 23:56:28 +0000
commit0c9e60e741e93b599af8a7c976112dc587ad23de (patch)
tree201a62193d1e3c9cb0d9242cc20a8fcd3ee0fdf0 /upgrade.py
parent34f2f5fd284cf8e70680934bc07d7539600ed312 (diff)
downloadanaconda-0c9e60e741e93b599af8a7c976112dc587ad23de.tar.gz
anaconda-0c9e60e741e93b599af8a7c976112dc587ad23de.tar.xz
anaconda-0c9e60e741e93b599af8a7c976112dc587ad23de.zip
various pychecker fixups
Diffstat (limited to 'upgrade.py')
-rw-r--r--upgrade.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/upgrade.py b/upgrade.py
index 3b08d37e6..72e17074e 100644
--- a/upgrade.py
+++ b/upgrade.py
@@ -127,9 +127,8 @@ def swapSuggestion(instPath, fsset):
return (fsList, suggestion, suggMnt)
def swapfileExists(swapname):
-
try:
- rc = os.lstat(swapname)
+ os.lstat(swapname)
return 1
except:
return 0
@@ -138,7 +137,7 @@ def swapfileExists(swapname):
def createSwapFile(instPath, thefsset, mntPoint, size):
fstabPath = instPath + "/etc/fstab"
prefix = ""
- if theFstab.rootOnLoop():
+ if thefsset.rootOnLoop():
instPath = "/mnt/loophost"
prefix = "/initrd/loopfs"
@@ -147,7 +146,7 @@ def createSwapFile(instPath, thefsset, mntPoint, size):
else:
file = "/SWAP"
- existingSwaps = theFstab.swapList(files = 1)
+ existingSwaps = thefsset.swapList(files = 1)
swapFileDict = {}
for n in existingSwaps:
dev = n[0]