summaryrefslogtreecommitdiffstats
path: root/partIntfHelpers.py
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2009-02-06 16:43:24 -0500
committerDavid Cantrell <dcantrell@redhat.com>2009-02-12 11:31:01 -1000
commit033f973c70a2afe528caa8863823cbccbfc88172 (patch)
tree6142505d0cfec3cb6cd7d007785adbfc9a2fd511 /partIntfHelpers.py
parent78069ada041b7c34a7c3a826687426e350a533c6 (diff)
downloadanaconda-033f973c70a2afe528caa8863823cbccbfc88172.tar.gz
anaconda-033f973c70a2afe528caa8863823cbccbfc88172.tar.xz
anaconda-033f973c70a2afe528caa8863823cbccbfc88172.zip
getPartitionByPath expects the device to start with /dev/.
Diffstat (limited to 'partIntfHelpers.py')
-rw-r--r--partIntfHelpers.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/partIntfHelpers.py b/partIntfHelpers.py
index a47222fb6..0c6541cda 100644
--- a/partIntfHelpers.py
+++ b/partIntfHelpers.py
@@ -258,7 +258,7 @@ def doDeletePartitionsByDevice(intf, requestlist, diskset, device,
for req in requests:
for drive in req.drive:
- part = diskset.disks[drive].getPartitionByPath(req.device)
+ part = diskset.disks[drive].getPartitionByPath("/dev/%s" % req.device)
if part.type & parted.PARTITION_FREESPACE or \
part.type & parted.PARTITION_METADATA or \
@@ -298,7 +298,7 @@ def doDeletePartitionsByDevice(intf, requestlist, diskset, device,
for req in left_requests:
for drive in req.drive:
- part = diskset.disks[drive].getPartitionByPath(req.device)
+ part = diskset.disks[drive].getPartitionByPath("/dev/%s" % req.device)
if part.type & parted.PARTITION_FREESPACE or \
part.type & parted.PARTITION_METADATA or \
@@ -402,11 +402,11 @@ def checkForSwapNoMatch(anaconda):
diskset = anaconda.id.diskset
for request in anaconda.id.partitions.requests:
- if not request.device or not request.fstype:
+ if not request.dev or not request.fstype:
continue
for drive in request.drive:
- part = diskset.disks[drive].getPartitionByPath(request.device)
+ part = diskset.disks[drive].getPartitionByPath("/dev/%s" % request.device)
if (part and (not part.type & parted.PARTITION_FREESPACE)
and (part.getFlag(parted.PARTITION_SWAP))