From d2b0fccdc4eccec2f9ec7fc9649aebfea6a52926 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 12 Nov 2001 20:50:41 +0000 Subject: merge fix to HEAD --- partitioning.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'partitioning.py') 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: -- cgit