summaryrefslogtreecommitdiffstats
path: root/autopart.py
diff options
context:
space:
mode:
authorMike Fulbright <msf@redhat.com>2001-06-22 23:26:15 +0000
committerMike Fulbright <msf@redhat.com>2001-06-22 23:26:15 +0000
commitc020c815fbb67debe44bbfd05b3979a064028572 (patch)
treed3415e5589bd36eb52971a1c103f4f8698b092ee /autopart.py
parentd41c337f3f8a8acb13b5d040313e1e3631fb04f5 (diff)
downloadanaconda-c020c815fbb67debe44bbfd05b3979a064028572.tar.gz
anaconda-c020c815fbb67debe44bbfd05b3979a064028572.tar.xz
anaconda-c020c815fbb67debe44bbfd05b3979a064028572.zip
fixes based on pychecker output
Diffstat (limited to 'autopart.py')
-rw-r--r--autopart.py13
1 files changed, 5 insertions, 8 deletions
diff --git a/autopart.py b/autopart.py
index 2e362cb92..a33658a05 100644
--- a/autopart.py
+++ b/autopart.py
@@ -17,6 +17,8 @@ import parted
import math
import fsset
from partitioning import *
+from dispatch import DISPATCH_NOOP
+from translate import _, N_
PARTITION_FAIL = -1
PARTITION_SUCCESS = 0
@@ -119,7 +121,7 @@ def fitConstrained(diskset, requests, primOnly=0):
constraint = disk.constraint_any ()
try:
disk.add_partition (newp, constraint)
- status = 1
+
except parted.error, msg:
return PARTITION_FAIL
# raise PartitioningError, msg
@@ -528,14 +530,9 @@ def doAutoPartition(id):
try:
doPartitioning(id.diskset, id.partrequests)
- rc = 0
except PartitioningError, msg:
# restore drives to original state
id.diskset.refreshDevices()
- id.partrequests = partitioning.PartitionRequests(id.diskset)
- self.intf.messageWindow(_("Error Partitioning"),
+ id.partrequests = PartitionRequests(id.diskset)
+ id.intf.messageWindow(_("Error Partitioning"),
_("Could not allocated requested partitions: %s.") % (msg))
- rc = -1
-
-
-