summaryrefslogtreecommitdiffstats
path: root/isys
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2005-06-22 18:56:03 +0000
committerJeremy Katz <katzj@redhat.com>2005-06-22 18:56:03 +0000
commitfbb4522e01243dacfa52dd60eb035dcc7ee00690 (patch)
tree95fb485b9bfe464a935b4455edc1c1de3d415d96 /isys
parent47e439f0b592587ed513594039f79d592e8c8ae4 (diff)
downloadanaconda-fbb4522e01243dacfa52dd60eb035dcc7ee00690.tar.gz
anaconda-fbb4522e01243dacfa52dd60eb035dcc7ee00690.tar.xz
anaconda-fbb4522e01243dacfa52dd60eb035dcc7ee00690.zip
and actually commit
Diffstat (limited to 'isys')
-rw-r--r--isys/isys.py8
1 files changed, 0 insertions, 8 deletions
diff --git a/isys/isys.py b/isys/isys.py
index 2d1f89cee..a4653d5c5 100644
--- a/isys/isys.py
+++ b/isys/isys.py
@@ -694,17 +694,9 @@ def oldSwapLabelMunge(device):
def readSwapLabel(device, makeDevNode = 1):
if makeDevNode:
makeDevInode(device, "/tmp/disk")
- try:
- oldSwapLabelMunge("/tmp/disk")
- except Exception, e:
- log("error munging swap label: %s" %(e,))
label = readSwapLabel_int("/tmp/disk")
os.unlink("/tmp/disk")
else:
- try:
- oldSwapLabelMunge(device)
- except Exception, e:
- log("error munging swap label: %s" %(e,))
label = readSwapLabel_int(device)
return label