1) Return the format minSize in StorageDevice.minSize() if we
have it, do not compare to self.size.
2) PartitionDevice.maxSize() cannot use 'max' as a variable name
since that's a built-in function.
---
storage/devices.py | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/storage/devices.py b/storage/devices.py
index c97ce7f..84cfe1b 100644
--- a/storage/devices.py
+++ b/storage/devices.py
@@ -482,7 +482,7 @@ class StorageDevice(Device):
if self.exists:
self.setup()
- if self.format.minSize < self.size:
+ if self.format.minSize:
return self.format.minSize
else:
return self.size
@@ -1072,10 +1072,10 @@ class PartitionDevice(StorageDevice):
def maxSize(self):
""" The maximum size this partition can be. """
# XXX: this is MB by default
- max = self.partedPartition.getMaxAvailableSize()
+ maxPartSize = self.partedPartition.getMaxAvailableSize()
- if self.format.maxSize > max:
- return max
+ if self.format.maxSize > maxPartSize:
+ return maxPartSize
else:
return self.format.maxSize
--
1.6.1.3
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
