2008-06-04 Ján ONDREJ <ondrejj@salstar.sk> (via ondrejj@fedoraproject.org)

  * po/sk.po: Typo fix.

1 files changed, 8 insertions, 7 deletions

diff --git a/autopart.py b/autopart.py
index 4e624fd7d..1028b5de4 100644
--- a/autopart.py
+++ b/autopart.py
@@ -26,7 +26,6 @@ import string, sys
 import fsset
 import lvm
 import logging
-import rhpl
 from anaconda_log import logger, logFile
 import cryptodev
 import partedUtils
@@ -34,13 +33,15 @@ import partRequests
 from constants import *
 from partErrors import *
 
-from rhpl.translate import _, N_
-
 import iutil
 import isys
 
 log = logging.getLogger("anaconda")
 
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
+
+
 PARTITION_FAIL = -1
 PARTITION_SUCCESS = 0
 
@@ -80,7 +81,7 @@ def bootRequestCheck(req, diskset):
         elif req.mountpoint == "/boot/efi":
             if not part.fs_type.name in ["fat16", "fat32"]:
                 return BOOTEFI_NOT_VFAT
-    elif rhpl.getArch() == "alpha":
+    elif iutil.isAlpha():
         return bootAlphaCheckRequirements(part)
     elif (iutil.getPPCMachine() == "pSeries" or
           iutil.getPPCMachine() == "iSeries"):
@@ -272,7 +273,7 @@ def fitConstrained(diskset, requests, primOnly=0, newParts = None):
                 disk.add_partition (newp, constraint)
 
             except parted.error, msg:
-                raise PartitioningError, msg
+                raise PartitioningError, str(msg)
             for flag in request.fstype.getPartedPartitionFlags():
                 if not newp.is_flag_available(flag):
                     disk.delete_partition(newp)
@@ -412,7 +413,7 @@ def fitSized(diskset, requests, primOnly = 0, newParts = None):
             startSec = freeStartSec
 
 	    # For alpha reserve space at the begining of disk
-	    if rhpl.getArch() == "alpha" and startSec < long((1024L * 1024L)/disk.dev.sector_size):
+	    if iutil.isAlpha() and startSec < long((1024L * 1024L)/disk.dev.sector_size):
 		startSec = long((2 * 1024L * 1024L)/disk.dev.sector_size)
 
             endSec = startSec + long(((request.requestSize * 1024L * 1024L) / disk.dev.sector_size)) - 1
@@ -475,7 +476,7 @@ def fitSized(diskset, requests, primOnly = 0, newParts = None):
             try:
                 disk.add_partition (newp, constraint)
             except parted.error, msg:
-                raise PartitioningError, msg
+                raise PartitioningError, str(msg)
             for flag in request.fstype.getPartedPartitionFlags():
                 if not newp.is_flag_available(flag):
                     disk.delete_partition(newp)