diff options
| author | Jeremy Katz <katzj@redhat.com> | 2001-11-12 20:50:41 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2001-11-12 20:50:41 +0000 |
| commit | d2b0fccdc4eccec2f9ec7fc9649aebfea6a52926 (patch) | |
| tree | b131dcabb3497414783a9e77b346bab122ae80d6 /partitioning.py | |
| parent | 198550cfa45fbaf032bfd1b6a337ed71d156b973 (diff) | |
| download | anaconda-d2b0fccdc4eccec2f9ec7fc9649aebfea6a52926.tar.gz anaconda-d2b0fccdc4eccec2f9ec7fc9649aebfea6a52926.tar.xz anaconda-d2b0fccdc4eccec2f9ec7fc9649aebfea6a52926.zip | |
merge fix to HEAD
Diffstat (limited to 'partitioning.py')
| -rw-r--r-- | partitioning.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/partitioning.py b/partitioning.py index a620ed4db..eff2db4f1 100644 --- a/partitioning.py +++ b/partitioning.py @@ -541,7 +541,11 @@ def sanityCheckRaidRequest(reqpartitions, newraid, doPartitionCheck = 1): # return the actual size being used by the request in megabytes def requestSize(req, diskset): if req.type == REQUEST_RAID: - thissize = req.size + # XXX duplicate the hack below. + if req.size != None: + thissize = req.size + else: + thissize = 0 else: part = get_partition_by_name(diskset.disks, req.device) if not part: @@ -590,7 +594,7 @@ def sanityCheckAllRequests(requests, diskset, baseChecks = 0): foundSwap = 0 swapSize = 0 for request in requests.requests: - if request.fstype and request.fstype.getName() == "swap" and not request.raidlevel: + if request.fstype and request.fstype.getName() == "swap": foundSwap = foundSwap + 1 swapSize = swapSize + requestSize(request, diskset) if baseChecks: |