Attachment 703048 Details for Bug 684899 – Applies cleanly to the 0.8.7-4 source rpm, fixes RHEL 6 breakage

[patch] Applies cleanly to the 0.8.7-4 source rpm, fixes RHEL 6 breakage

mrepo-rpl.patch (text/plain), 36.19 KB, created by Andrew Wyatt on 2013-02-26 17:34:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Wyatt

Created: 2013-02-26 17:34:31 UTC

Size: 36.19 KB

patch

obsolete

>diff -rupN mrepo-0.8.7.orig/up2date_client/capabilities.py mrepo-0.8.7/up2date_client/capabilities.py
>--- mrepo-0.8.7.orig/up2date_client/capabilities.py	2013-02-26 10:16:02.353503752 -0600
>+++ mrepo-0.8.7/up2date_client/capabilities.py	2013-02-26 10:29:10.682491182 -0600
>@@ -13,8 +13,6 @@ import rpcServer
> import string
> 
> 
>-from rhpl.translate import _, N_
>-
> neededCaps = {"caneatCheese": {'version':"21"},
>               "supportsAutoUp2dateOption": {'version': "1"},
>               "registration.finish_message": {'version': "1"},
>@@ -89,8 +87,8 @@ class Capabilities(UserDict.UserDict):
> 
>     def validateCap(self, cap, capvalue):
>         if not self.data.has_key(cap):
>-            errstr = _("This client requires the server to support %s, which the current " \
>-                       "server does not support") % cap
>+            errstr = "This client requires the server to support %s, which the current " \
>+                     "server does not support" % cap
>             self.missingCaps[cap] = None
>         else:
>             data = self.data[cap]
>diff -rupN mrepo-0.8.7.orig/up2date_client/clientCaps.py mrepo-0.8.7/up2date_client/clientCaps.py
>--- mrepo-0.8.7.orig/up2date_client/clientCaps.py	2013-02-26 10:16:02.351503829 -0600
>+++ mrepo-0.8.7/up2date_client/clientCaps.py	2013-02-26 10:29:10.682491182 -0600
>@@ -9,8 +9,6 @@ import os
> import string
> import sys
> 
>-from rhpl.translate import _, N_
>-
> import capabilities
> import config
> import up2dateErrors
>diff -rupN mrepo-0.8.7.orig/up2date_client/config.py mrepo-0.8.7/up2date_client/config.py
>--- mrepo-0.8.7.orig/up2date_client/config.py	2013-02-26 10:16:02.353503752 -0600
>+++ mrepo-0.8.7/up2date_client/config.py	2013-02-26 10:29:10.682491182 -0600
>@@ -17,8 +17,6 @@ import os
> import string
> import sys
> 
>-from rhpl.translate import _, N_
>-
> #cfg = None
> 
> # XXX: This could be moved in a more "static" location if it is too
>@@ -188,7 +186,7 @@ class ConfigFile:
>         # and fails (see #130391)
>         if not os.access(self.fileName, os.R_OK):
>             if not os.access(os.path.dirname(self.fileName), os.R_OK):
>-                print _("%s was not found" % os.path.dirname(self.fileName))
>+                print "%s was not found" % os.path.dirname(self.fileName)
>                 return
>         
>         f = open(self.fileName, "w")
>@@ -334,7 +332,7 @@ def initUp2dateConfig(file = "/etc/sysco
>         uuidCfg = UuidConfig()
>         uuidCfg.load()
>         if uuidCfg['rhnuuid'] == None or uuidCfg['rhnuuid'] == "UNSPECIFIED":
>-            print _("No rhnuuid config option found in /etc/sysconfig/rhn/up2date-uuid.")
>+            print "No rhnuuid config option found in /etc/sysconfig/rhn/up2date-uuid."
>             sys.exit(1)
>         cfg['rhnuuid'] = uuidCfg['rhnuuid']
> 
>diff -rupN mrepo-0.8.7.orig/up2date_client/repoBackends/yumRepo.py mrepo-0.8.7/up2date_client/repoBackends/yumRepo.py
>--- mrepo-0.8.7.orig/up2date_client/repoBackends/yumRepo.py	2013-02-26 10:16:02.351503829 -0600
>+++ mrepo-0.8.7/up2date_client/repoBackends/yumRepo.py	2013-02-26 10:29:10.682491182 -0600
>@@ -22,8 +22,6 @@ from up2date_client import config
> from up2date_client import rpcServer
> from up2date_client import up2dateUtils
> 
>-from rhpl.translate import _, N_
>-
> import genericRepo
> import urlUtils
> import genericSolveDep
>@@ -106,7 +104,7 @@ class YumRepoSource(rpmSource.PackageSou
>                                                hdr['release'])] = hdr
>                 nohdr = 0
>             except:
>-                print _("There was an error downloading:"), "%s"  % url
>+                print "There was an error downloading:", "%s"  % url
>                 nohdr = 1
> 
>         return hdr
>diff -rupN mrepo-0.8.7.orig/up2date_client/rhnChannel.py mrepo-0.8.7/up2date_client/rhnChannel.py
>--- mrepo-0.8.7.orig/up2date_client/rhnChannel.py	2013-02-26 10:16:02.353503752 -0600
>+++ mrepo-0.8.7/up2date_client/rhnChannel.py	2013-02-26 10:39:11.329501943 -0600
>@@ -17,7 +17,6 @@ import urlMirrors
> from rhn import rpclib
> 
> 
>-from rhpl.translate import _, N_
> 
> 
> 
>@@ -184,7 +183,7 @@ def getChannels(force=None, label_whitel
>                 selected_channels.addChannel(channel)
> 
>             if len(selected_channels.list) == 0:
>-                raise up2dateErrors.NoChannelsError(_("This system may not be updated until it is associated with a channel."))
>+                raise up2dateErrors.NoChannelsError("This system may not be updated until it is associated with a channel.")
>         # doesnt do much at the moment, but I've got the feeling
>         # it's going to get much more complicated
> 
>diff -rupN mrepo-0.8.7.orig/up2date_client/rhnErrata.py mrepo-0.8.7/up2date_client/rhnErrata.py
>--- mrepo-0.8.7.orig/up2date_client/rhnErrata.py	2013-02-26 10:16:02.353503752 -0600
>+++ mrepo-0.8.7/up2date_client/rhnErrata.py	2013-02-26 10:29:10.683491359 -0600
>@@ -6,7 +6,6 @@ import sys
> sys.path.insert(0, "/usr/share/rhn/")
> sys.path.insert(1,"/usr/share/rhn/up2date_client")
> 
>-from rhpl.translate import _, N_
> import up2dateErrors
> import up2dateMessages
> import rpmUtils
>diff -rupN mrepo-0.8.7.orig/up2date_client/rpcServer.py mrepo-0.8.7/up2date_client/rpcServer.py
>--- mrepo-0.8.7.orig/up2date_client/rpcServer.py	2013-02-26 10:16:02.353503752 -0600
>+++ mrepo-0.8.7/up2date_client/rpcServer.py	2013-02-26 10:53:07.384501165 -0600
>@@ -22,9 +22,6 @@ import repoDirector
> #import wrapperUtils
> from rhn import rpclib
>     
>-from rhpl.translate import _, N_
>-            
>-
> def stdoutMsgCallback(msg):
>     print msg
> 
>@@ -197,7 +194,7 @@ def getServer(refreshCallback=None):
>     # require RHNS-CA-CERT file to be able to authenticate the SSL connections
>     for rhns_ca_cert in rhns_ca_certs:
>         if not os.access(rhns_ca_cert, os.R_OK):
>-	    msg = "%s: %s" % (_("ERROR: can not find RHNS CA file:"),
>+	    msg = "%s: %s" % ("ERROR: can not find RHNS CA file:",
> 				 rhns_ca_cert)
>             log.log_me("%s" % msg)
> 	    print msg
>@@ -235,8 +232,8 @@ def doCall(method, *args, **kwargs):
>         try:
>             ret = apply(method, args, kwargs)
>         except KeyboardInterrupt:
>-            raise up2dateErrors.CommunicationError(_(
>-                "Connection aborted by the user"))
>+            raise up2dateErrors.CommunicationError(
>+                "Connection aborted by the user")
>         # if we get a socket error, keep tryingx2
>         except (socket.error, socket.sslerror), e:
>             log.log_me("A socket error occurred: %s, attempt #%s" % (
>@@ -279,7 +276,7 @@ def doCall(method, *args, **kwargs):
>             # the servers are being throttle to pay users only, catch the
>             # exceptions and display a nice error message
>             if abs(errCode) == 51:
>-                log.log_me(_("Server has refused connection due to high load"))
>+                log.log_me("Server has refused connection due to high load")
>                 raise up2dateErrors.CommunicationError(e.errmsg)
>             # if we get a 404 from our server, thats pretty
>             # fatal... no point in retrying over and over. Note that
>diff -rupN mrepo-0.8.7.orig/up2date_client/rpmSource.py mrepo-0.8.7/up2date_client/rpmSource.py
>--- mrepo-0.8.7.orig/up2date_client/rpmSource.py	2013-02-26 10:16:02.353503752 -0600
>+++ mrepo-0.8.7/up2date_client/rpmSource.py	2013-02-26 10:35:46.769510857 -0600
>@@ -41,7 +41,6 @@ import rpmSourceUtils
> 
> from rhn import rpclib
> 
>-from rhpl.translate import _, N_
> 
> 
> BUFFER_SIZE = 8092
>@@ -346,7 +345,7 @@ class LocalDisk(PackageSource):
>                     except:
>                         os.close(fd)
>                         self.ts.popVSFlags()
>-                        raise up2dateErrors.RpmError(_("Error reading header"))
>+                        raise up2dateErrors.RpmError("Error reading header")
>                     self.ts.popVSFlags()
>                     os.close(fd)
>                     self.headerCache[up2dateUtils.pkgToStringArch(pkg)] = hdr
>@@ -384,8 +383,7 @@ class LocalDisk(PackageSource):
>                                 hdr = self.ts.hdrFromFdno(fd)
>                             except:
>                                 os.close(fd)
>-                                raise up2dateErrors.RpmError(_(
>-                                    "Error reading header"))
>+                                raise up2dateErrors.RpmError("Error reading header")
>                             os.close(fd)
>                             self.log.log_me("Reading header from: %s" % fileNames)
>                             self.headerCache[up2dateUtils.pkgToStringArch(pkg)] = hdr
>@@ -457,7 +455,7 @@ class DiskCache(PackageSource):
>         except:
>              os.close(fd)
>              self.ts.popVSFlags()
>-             raise up2dateErrors.RpmError(_("Error reading header"))
>+             raise up2dateErrors.RpmError("Error reading header")
>         self.ts.popVSFlags()
>         os.close(fd)
>         self.log.log_me("Reading header from: %s" % fileNames)
>@@ -640,8 +638,7 @@ class Up2datePackageSource(PackageSource
>         try:
>             ret = self.s.up2date.header(up2dateAuth.getSystemId(), pkg)
>         except KeyboardInterrupt:
>-            raise up2dateErrors.CommunicationError(_(
>-                "Connection aborted by the user"))
>+            raise up2dateErrors.CommunicationError("Connection aborted by the user")
>         except (socket.error, socket.sslerror), e:
>             if len(e.args) > 1:
>                 raise up2dateErrors.CommunicationError(e.args[1])
>@@ -650,8 +647,7 @@ class Up2datePackageSource(PackageSource
>         except rpclib.ProtocolError, e:
>             raise up2dateErrors.CommunicationError(e.errmsg)
>         except rpclib.ResponseError:
>-            raise up2dateErrors.CommunicationError(
>-                "Broken response from the server.");
>+            raise up2dateErrors.CommunicationError("Broken response from the server.");
>         except rpclib.Fault, f:
>             raise up2dateErrors.CommunicationError(f.faultString)
> 
>diff -rupN mrepo-0.8.7.orig/up2date_client/rpmSourceUtils.py mrepo-0.8.7/up2date_client/rpmSourceUtils.py
>--- mrepo-0.8.7.orig/up2date_client/rpmSourceUtils.py	2013-02-26 10:16:02.353503752 -0600
>+++ mrepo-0.8.7/up2date_client/rpmSourceUtils.py	2013-02-26 10:35:46.771510592 -0600
>@@ -9,7 +9,6 @@ import sys
> import glob
> 
> from rhn import rpclib
>-from rhpl.translate import _, N_
> 
> 
> def factory(aClass, *args, **kwargs):
>diff -rupN mrepo-0.8.7.orig/up2date_client/rpmUtils.py mrepo-0.8.7/up2date_client/rpmUtils.py
>--- mrepo-0.8.7.orig/up2date_client/rpmUtils.py	2013-02-26 10:16:02.353503752 -0600
>+++ mrepo-0.8.7/up2date_client/rpmUtils.py	2013-02-26 10:51:42.135502450 -0600
>@@ -30,7 +30,6 @@ import transaction
> import string
> 
> 
>-from rhpl.translate import _, N_
> from up2date_client import up2dateLog            
> 
> # mainly here to make conflicts resolution cleaner
>@@ -255,7 +254,7 @@ def checkHeaderForFileConfigExcludes(h,p
>             
>             if fnmatch.fnmatch(fileNames[f_i],pattern):
>                 # got to get a better string to use here
>-                removedList.append((package, _("File Name/pattern")))
>+                removedList.append((package, "File Name/pattern"))
>                 fflag = 1
>                 break
>             # if we found a matching file, no need to
>@@ -280,7 +279,7 @@ def checkHeaderForFileConfigExcludes(h,p
>                     # check if config file and if so, if modified
>                     if checkModified(f_i, fileNames, fileMD5s,
>                                      installedFileNames, installedFileMD5s):
>-                        removedList.append((package, _("Config modified")))
>+                        removedList.append((package, "Config modified"))
>                         fflag = 1
>                         break
> 
>@@ -455,7 +454,7 @@ def getInstalledPackageList(msgCallback 
> 
>     
>     if msgCallback != None:
>-        msgCallback(_("Getting list of packages installed on the system"))
>+        msgCallback("Getting list of packages installed on the system")
>  
>     _ts = transaction.initReadOnlyTransaction()   
>     count = 0
>@@ -505,9 +504,9 @@ def runTransaction(ts, rpmCallback, tran
>         transdir = cfg['storageDir']
>     deps = ts.check()
>     if deps:
>-        raise up2dateErrors.DependencyError(_(
>+        raise up2dateErrors.DependencyError(
>             "Dependencies should have already been resolved, "\
>-            "but they are not."), deps)
>+            "but they are not.", deps)
>     rc = ts.run(rpmCallback, transdir)
>     if rc:
>         errors = "\n"
>@@ -516,13 +515,13 @@ def runTransaction(ts, rpmCallback, tran
>                 errors = errors + e[1] + "\n"
>             except:
>                 errors = errors + str(e) + "\n"
>-        raise up2dateErrors.TransactionError(_(
>-            "Failed running transaction of  packages: %s") % errors, deps=rc)
>+        raise up2dateErrors.TransactionError(
>+            "Failed running transaction of  packages: %s" % errors, deps=rc)
>     elif type(rc) == type([]) and not len(rc):
>         # let the user know whats wrong
>         log = up2dateLog.initLog()
>         log.log_me("Failed running rpm transaction - %pre %pro failure ?.")
>-        raise up2dateErrors.RpmError(_("Failed running rpm transaction"))
>+        raise up2dateErrors.RpmError("Failed running rpm transaction")
> 
> def readHeader(filename):
>     if not os.access(filename, os.R_OK):
>@@ -549,9 +548,9 @@ def readHeaderBlob(blob, filename=None):
>         hdr = rpm.headerLoad(blob)
>     except:
>         if filename:
>-            print _("rpm was unable to load the header: %s" % filename)
>+            print "rpm was unable to load the header: %s" % filename
>         else:
>-            print _("rpm was unable to load a header")
>+            print "rpm was unable to load a header"
>         return None
>     # Header successfully read
>     #print hdr['name']
>diff -rupN mrepo-0.8.7.orig/up2date_client/sourcesConfig.py mrepo-0.8.7/up2date_client/sourcesConfig.py
>--- mrepo-0.8.7.orig/up2date_client/sourcesConfig.py	2013-02-26 10:16:02.351503829 -0600
>+++ mrepo-0.8.7/up2date_client/sourcesConfig.py	2013-02-26 10:35:46.772510460 -0600
>@@ -19,8 +19,6 @@ import up2dateUtils
> import up2dateLog
> import wrapperUtils
> 
>-from rhpl.translate import _, N_
>-
> # The format for sources v1 is stupid. each entry can only be one line
> # each different source type has different info (aieee!) # comment stuff out (duh)
> 
>@@ -28,8 +26,8 @@ from rhpl.translate import _, N_
> SOURCESFILE="/etc/sysconfig/rhn/sources"
> 
> def showError(line):
>-    print _("Error parsing %s") % SOURCESFILE
>-    print _("at line: %s") % line
>+    print "Error parsing %s" % SOURCESFILE
>+    print "at line: %s" % line
> 
> class SourcesConfigFile:
>     "class for parsing out the up2date/apt/yum src repo info"
>@@ -223,7 +221,7 @@ class SourcesConfigFile:
>         try:
>             from repoBackends import yumBaseRepo
>         except ImportError:
>-            self.log.log_me(_("Unable to import repomd so repomd support will not be available"))
>+            self.log.log_me("Unable to import repomd so repomd support will not be available")
>             return
>         
>         yb = yumBaseRepo.initYumRepo()
>diff -rupN mrepo-0.8.7.orig/up2date_client/up2dateErrors.py mrepo-0.8.7/up2date_client/up2dateErrors.py
>--- mrepo-0.8.7.orig/up2date_client/up2dateErrors.py	2013-02-26 10:16:02.351503829 -0600
>+++ mrepo-0.8.7/up2date_client/up2dateErrors.py	2013-02-26 10:51:07.983499612 -0600
>@@ -9,7 +9,6 @@
> #
> 
> import up2dateLog
>-from rhpl.translate import _, N_
> 
> 
> class Error:
>@@ -27,7 +26,7 @@ class FileError(Error):
>     error to report when we encounter file errors (missing files/dirs,
>     lack of permissions, quoat issues, etc"""
>     def __repr__(self):
>-        msg = _("Disk error.  The message was:\n") + self.errmsg
>+        msg = "Disk error.  The message was:\n" + self.errmsg
>         log = up2dateLog.initLog()
>         log.log_me(msg)
>         return msg
>@@ -35,7 +34,7 @@ class FileError(Error):
> class RpmError(Error):
>     """rpm itself raised an error condition"""
>     def __repr__(self):
>-        msg = _("RPM error.  The message was:\n") + self.errmsg
>+        msg = "RPM error.  The message was:\n" + self.errmsg
>         log = up2dateLog.initLog()
>         log.log_me(msg)
>         return msg
>@@ -46,7 +45,7 @@ class RpmInstallError(Error):
>         self.errmsg = msg
>         self.pkg = pkg
>     def __repr__(self):
>-        msg = _("There was a fatal error installing the package:\n")
>+        msg = "There was a fatal error installing the package:\n"
>         msg = msg + self.errmsg
>         log = up2dateLog.initLog()
>         log.log_me(msg)
>@@ -57,7 +56,7 @@ class PasswordError(Error):
>     """Raise when the server responds with that a password is incorrect"""
>     def __repr__(self):
>         log = up2dateLog.initLog()
>-        msg = _("Password error. The message was:\n") + self.errmsg
>+        msg = "Password error. The message was:\n" + self.errmsg
>         log.log_me(msg)
>         return msg
> 
>@@ -68,7 +67,7 @@ class ConflictError(Error):
>         self.errmsg = msg
>         self.data = data
>     def __repr__(self):
>-        msg = _("RPM package conflict error.  The message was:\n")
>+        msg = "RPM package conflict error.  The message was:\n"
>         msg = msg + self.errmsg
>         log = up2dateLog.initLog()
>         log.log_me(msg)
>@@ -80,7 +79,7 @@ class FileConflictError(Error):
>         self.rc = rc
>         self.errmsg = msg
>     def __repr__(self):
>-        msg = _("RPM file conflict error. The message was:\n") + self.errmsg
>+        msg = "RPM file conflict error. The message was:\n" + self.errmsg
>         log = up2dateLog.initLog()
>         log.log_me(msg)
>         return msg
>@@ -94,7 +93,7 @@ class DependencyError(Error):
>         self.deps = deps
>         
>     def __repr__(self):
>-        msg = _("RPM dependency error. The message was:\n") + self.errmsg
>+        msg = "RPM dependency error. The message was:\n" + self.errmsg
>         log = up2dateLog.initLog()
>         log.log_me(msg)
>         return msg
>@@ -108,7 +107,7 @@ class TransactionError(Error):
>         self.deps = deps
>         
>     def __repr__(self):
>-        msg = _("RPM  error. The message was:\n") + self.errmsg
>+        msg = "RPM  error. The message was:\n" + self.errmsg
>         log = up2dateLog.initLog()
>         log.log_me(msg)
>         return msg
>@@ -121,7 +120,7 @@ class UnsolvedDependencyError(Error):
>         self.dep = dep
>         self.pkgs = pkgs 
>     def __repr__(self):
>-        msg = _("RPM dependency error.  The message was:\n") + self.errmsg
>+        msg = "RPM dependency error.  The message was:\n" + self.errmsg
>         log = up2dateLog.initLog()
>         log.log_me(msg)
>         return msg
>@@ -134,7 +133,7 @@ class DependencySenseError(Error):
>         self.errmsg = msg
>         self.sense = sense
>     def __repr__(self):
>-        msg = _("RPM dependency error.  The message was:\n") + self.errmsg
>+        msg = "RPM dependency error.  The message was:\n" + self.errmsg
>         log = up2dateLog.initLog()
>         log.log_me(msg)
>         return msg
>@@ -145,7 +144,7 @@ class SkipListError(Error):
> 	self.errmsg = msg
> 	self.pkglist = pkglist 
>     def __repr__(self):
>-        msg = _("Package Skip List error.  The message was:\n") + self.errmsg
>+        msg = "Package Skip List error.  The message was:\n" + self.errmsg
>         log = up2dateLog.initLog()
>         log.log_me(msg)
>         return msg
>@@ -158,8 +157,8 @@ class FileConfigSkipListError(Error):
>         self.errmsg = msg
>         self.pkglist = pkglist
>     def __repr__(self):
>-        msg = _("File Skip List or config file overwrite error. "\
>-                "The message was:\n") + self.errmsg
>+        msg = "File Skip List or config file overwrite error. "\
>+                "The message was:\n" + self.errmsg
>         log = up2dateLog.initLog()
>         log.log_me(msg)
>         return msg
>@@ -168,8 +167,8 @@ class FileConfigSkipListError(Error):
> class CommunicationError(Error):
>     """Indicates a problem doing xml-rpc http communication with the server"""
>     def __repr__(self):
>-        msg =  _("Error communicating with server. "\
>-                 "The message was:\n") + self.errmsg
>+        msg =  "Error communicating with server. "\
>+                 "The message was:\n" + self.errmsg
>         log = up2dateLog.initLog()
>         log.log_me(msg)
>         return msg
>@@ -179,7 +178,7 @@ class FileNotFoundError(Error):
>     Raise when a package or header that is requested returns
>     a 404 error code"""
>     def __repr__(self):
>-        msg =  _("File Not Found: \n") + self.errmsg
>+        msg =  "File Not Found: \n" + self.errmsg
>         log = up2dateLog.initLog()
>         log.log_me(msg)
>         return msg
>@@ -190,7 +189,7 @@ class DelayError(Error):
>     Raise when the expected response from a xml-rpc call
>     exceeds a timeout"""
>     def __repr__(self):
>-        msg =  _("Delay error from server.  The message was:\n") + self.errmsg
>+        msg =  "Delay error from server.  The message was:\n" + self.errmsg
>         log = up2dateLog.initLog()
>         log.log_me(msg)
>         return msg
>@@ -198,8 +197,8 @@ class DelayError(Error):
> class RpmRemoveSkipListError(Error):
>     """Raise when we try to remove a package on the RemoveSkipList"""
>     def __repr__(self):
>-        msg = _("Could not remove package \"%s\". "\
>-                "It was on the RemoveSkipList") % self.errmsg
>+        msg = "Could not remove package \"%s\". "\
>+                "It was on the RemoveSkipList" % self.errmsg
>         log = up2dateLog.initLog()
>         log.log_me(msg)
>         return msg
>@@ -221,7 +220,7 @@ class RpmRemoveError(Error):
> class GPGInstallationError(Error):
>     """Raise when we we detect that the GPG is not installed properly"""
>     def __repr__(self):
>-        msg = _("GPG is not installed properly.")
>+        msg = "GPG is not installed properly."
>         log = up2dateLog.initLog()
>         log.log_me(msg)
>         return msg
>@@ -231,8 +230,8 @@ class GPGKeyringError(Error):
>     Raise when we we detect that the gpg keyring for the user
>     does not have the Red Hat Key installed"""
>     def __repr__(self):
>-        msg = _("GPG keyring does not include the Red Hat, Inc. "\
>-                "public package-signing key")
>+        msg = "GPG keyring does not include the Red Hat, Inc. "\
>+                "public package-signing key"
>         log = up2dateLog.initLog()
>         log.log_me(msg)
>         return msg
>@@ -243,8 +242,8 @@ class GPGVerificationError(Error):
>         self.errmsg = msg
>         self.pkg = msg
>     def __repr__(self):
>-        msg = _("The package %s failed its gpg signature verification. "\
>-                "This means the package is corrupt." % self.errmsg)
>+        msg = "The package %s failed its gpg signature verification. "\
>+                "This means the package is corrupt." % self.errmsg
>         log = up2dateLog.initLog()
>         log.log_me(msg)
>         return msg
>@@ -257,7 +256,7 @@ class GPGVerificationUnsignedPackageErro
>         self.errmsg = msg
>         self.pkg = msg
>     def __repr__(self):
>-        msg = _("Package %s does not have a GPG signature.\n") %  self.errmsg
>+        msg = "Package %s does not have a GPG signature.\n" %  self.errmsg
>         log = up2dateLog.initLog()
>         log.log_me(msg)
>         return msg
>@@ -270,7 +269,7 @@ class GPGVerificationUntrustedKeyError(E
>         self.errmsg = msg
>         self.pkg = msg
>     def __repr__(self):
>-        msg = _("Package %s has a untrusted GPG signature.\n") % self.errmsg
>+        msg = "Package %s has a untrusted GPG signature.\n" % self.errmsg
>         log = up2dateLog.initLog()
>         log.log_me(msg)
>         return msg
>@@ -283,7 +282,7 @@ class GPGVerificationUnknownKeyError(Err
>         self.errmsg = msg
>         self.pkg = msg
>     def __repr__(self):
>-        msg = _("Package %s has a unknown GPG signature.\n") % self.errmsg
>+        msg = "Package %s has a unknown GPG signature.\n" % self.errmsg
>         log = up2dateLog.initLog()
>         log.log_me(msg)
>         return msg
>@@ -333,7 +332,7 @@ class ValidationError(Error):
> 
>     # indicates an error during server input validation
>     def __repr__(self):
>-        return _("Error validating data at server:\n") + self.errmsg
>+        return "Error validating data at server:\n" + self.errmsg
> 
> class InvalidProductRegistrationError(Error):
>     def __init__(self, errmsg):
>@@ -341,14 +340,14 @@ class InvalidProductRegistrationError(Er
> 
>     # indicates an error during server input validation
>     def __repr__(self):
>-        return _("The subscription number is invalid") + self.errmsg
>+        return "The subscription number is invalid" + self.errmsg
>     
> class OemInfoFileError(Error):
>     def __init__(self,errmsg):
>         Error.__init__(self, errmsg)
> 
>     def __repr__(self):
>-        return _("Error parsing the oemInfo file at field:\n") + self.errmsg
>+        return "Error parsing the oemInfo file at field:\n" + self.errmsg
> 
> class NoRollbacksToUndoError(Error):
>     """
>diff -rupN mrepo-0.8.7.orig/up2date_client/up2dateMessages.py mrepo-0.8.7/up2date_client/up2dateMessages.py
>--- mrepo-0.8.7.orig/up2date_client/up2dateMessages.py	2013-02-26 10:16:02.353503752 -0600
>+++ mrepo-0.8.7/up2date_client/up2dateMessages.py	2013-02-26 10:35:46.773510328 -0600
>@@ -8,36 +8,34 @@
> #
> # $Id: up2dateMessages.py 87080 2005-11-04 20:49:52Z alikins $
> 
>-from rhpl.translate import _, N_
>-
> from up2date_client import config
> 
> #cfg = config.initUp2dateConfig()
> 
>-needToRegister = _("You need to register this system by running `up2date --register` before using this option")
>+needToRegister = "You need to register this system by running `up2date --register` before using this option"
> 
>-storageDirWarningMsg = _("""The storage directory %s could not be found, or was not
>-accessable.""") % "/var/spool/up2date"
>+storageDirWarningMsg = """The storage directory %s could not be found, or was not
>+accessable.""" % "/var/spool/up2date"
> 
>-rootWarningMsg = _("You must run the Update Agent as root.")
>+rootWarningMsg = "You must run the Update Agent as root."
> 
>-registeredWarningMsg = _("""You are not registered with Red Hat Network.  To use Update Agent,
>+registeredWarningMsg = """You are not registered with Red Hat Network.  To use Update Agent,
> You must be registered.
> 
>-To register, run \"up2date --register\".""")
>+To register, run \"up2date --register\"."""
> 
> 
>-gpgWarningGuiMsg = _("""Your GPG keyring does not contain the Red Hat, Inc. public key.
>+gpgWarningGuiMsg = """Your GPG keyring does not contain the Red Hat, Inc. public key.
> Without it, you will be unable to verify that packages Update Agent downloads
> are securely signed by Red Hat.
> 
>-Your Update Agent options specify that you want to use GPG.""")
>+Your Update Agent options specify that you want to use GPG."""
> 
>-gpgWarningMsg = _("""Your GPG keyring does not contain the Red Hat, Inc. public key.
>+gpgWarningMsg = """Your GPG keyring does not contain the Red Hat, Inc. public key.
> Without it, you will be unable to verify that packages Update Agent downloads
> are securely signed by Red Hat.
> 
> Your Update Agent options specify that you want to use GPG.
> 
> To install the key, run the following as root:
>-""")
>+"""
>diff -rupN mrepo-0.8.7.orig/up2date_client/up2dateUtils.py mrepo-0.8.7/up2date_client/up2dateUtils.py
>--- mrepo-0.8.7.orig/up2date_client/up2dateUtils.py	2013-02-26 10:16:02.351503829 -0600
>+++ mrepo-0.8.7/up2date_client/up2dateUtils.py	2013-02-26 10:35:46.773510328 -0600
>@@ -23,8 +23,6 @@ import transaction
> import config
> 
> 
>-from rhpl.translate import _, N_
>-
> def rpmFlagsToOperator(flags):
>     flags = flags & 0xFF
>     buf = ""
>@@ -68,7 +66,7 @@ def pkglistToString(pkgs):
>     return packages
> 
> def restartUp2date():
>-    print _("Restarting up2date")
>+    print "Restarting up2date"
>     args = sys.argv[:]
>     return_code = os.spawnvp(os.P_WAIT, sys.argv[0], args)
>     sys.exit(return_code)
>diff -rupN mrepo-0.8.7.orig/up2date_client/wrapperUtils.py mrepo-0.8.7/up2date_client/wrapperUtils.py
>--- mrepo-0.8.7.orig/up2date_client/wrapperUtils.py	2013-02-26 10:16:02.353503752 -0600
>+++ mrepo-0.8.7/up2date_client/wrapperUtils.py	2013-02-26 10:35:46.774510199 -0600
>@@ -11,7 +11,6 @@ import string
> 
> import rpm
> 
>-from rhpl.translate import _, N_
> import up2dateErrors
> import up2dateMessages
> import rpmUtils
>@@ -46,7 +45,7 @@ class RpmCallback:
>             try:
>                 self.fd = os.open(fileName, os.O_RDONLY)
>             except OSError:
>-                raise up2dateErrors.RpmError(_("Error opening %s") % fileName)
>+                raise up2dateErrors.RpmError("Error opening %s" % fileName)
> 
>             return self.fd
>         elif what == rpm.RPMCALLBACK_INST_CLOSE_FILE:
>@@ -68,12 +67,12 @@ class RpmCallback:
>                                                    hdr['arch'])
>                 if self.cfg["isatty"]:
>                     if self.progressCurrent == 0:
>-                        printit(_("Installing")) 
>+                        printit("Installing") 
>                     print "%4d:%-23.23s" % (self.progressCurrent + 1,
>                                             hdr['name']),
>                     sys.stdout.flush()
>                 else:
>-                    printit(_("Installing %s") % fileName)
>+                    printit("Installing %s" % fileName)
> 
> 
>         # gets called at the start of each repackage, with a count of
>@@ -87,7 +86,7 @@ class RpmCallback:
> #            self.printRpmHash(amount, total, noInc=1)
>             
>         elif what == rpm.RPMCALLBACK_REPACKAGE_START:
>-            printit( _("Repackaging"))
>+            printit( "Repackaging")
>             #sys.stdout.flush()
>             #print "what: %s amount: %s total: %s hdr: %s path: %s" % (
>             # what, amount, total, hdr, path)
>@@ -109,7 +108,7 @@ class RpmCallback:
>             self.lastPercent = 0
>             self.progressTotal = 1
>             self.progressCurrent = 0
>-            print "%-23.23s" % _("Preparing"),
>+            print "%-23.23s" % "Preparing",
>             sys.stdout.flush()
> 
>         elif what == rpm.RPMCALLBACK_TRANS_STOP:
>@@ -239,7 +238,7 @@ def printRetrieveHash(amount, total, spe
> 
>     if cfg["isatty"]:
>         if amount == total:
>-            print "%-25s" % _(" Done.")
>+            print "%-25s" % " Done."
>         else:
>             print "%4d k/sec, %02d:%02d:%02d rem." % \
>                   (speed / 1024, secs / (60*60), (secs % 3600) / 60,
>@@ -247,7 +246,7 @@ def printRetrieveHash(amount, total, spe
>             for i in range(hashesTotal + 25):
>                 sys.stdout.write("\b")
>     elif amount == total:
>-        print _("Retrieved.")
>+        print "Retrieved."
> 
> def printPkg(name, shortName = None):
>     if shortName:
>@@ -266,17 +265,17 @@ def warningDialog(message, hasGui):
>             from up2date_client import gui
>             gui.errorWindow(message)
>         except:
>-            print _("Unable to open gui. Try `up2date --nox`")
>+            print "Unable to open gui. Try `up2date --nox`"
>             print message
>     else:
>         print message
> 
> 
> def printDepPackages(depPackages):
>-    print _("The following packages were added to your selection to satisfy dependencies:")
>-    print _("""
>+    print "The following packages were added to your selection to satisfy dependencies:"
>+    print """
> Name                                    Version        Release
>---------------------------------------------------------------""")
>+--------------------------------------------------------------"""
>     for pkg in depPackages:
>         print "%-40s%-15s%-20s" % (pkg[0], pkg[1], pkg[2])
>     print
>@@ -291,9 +290,9 @@ warningCallback = stdoutMsgCallback
> def printVerboseList(availUpdates):
>     cfg = config.initUp2dateConfig()
>     if cfg['showChannels']:
>-        print _("""
>+        print """
> Name                          Version        Rel             Channel     
>-----------------------------------------------------------------------""")
>+----------------------------------------------------------------------"""
>         for pkg in availUpdates:
>             print "%-30s%-15s%-15s%-20s" % (pkg[0], pkg[1], pkg[2], pkg[6])
>             if cfg["debug"]:
>@@ -304,12 +303,12 @@ Name                          Version   
>                         topic = string.join(string.split(a['topic']), ' ')
>                         print "[%s] %s\n" % (a['advisory'], topic)
>                 else:
>-                    print _("No advisory information available\n")
>+                    print "No advisory information available\n"
>         print
>         return
>-    print _("""
>+    print """
> Name                                    Version        Rel     
>-----------------------------------------------------------""")
>+----------------------------------------------------------"""
>     for pkg in availUpdates:
>         print "%-40s%-15s%-18s%-6s" % (pkg[0], pkg[1], pkg[2], pkg[4])
>         if cfg["debug"]:
>@@ -320,15 +319,15 @@ Name                                    
>                     topic = string.join(string.split(a['topic']), ' ')
>                     print "[%s] %s\n" % (a['advisory'], topic)
>             else:
>-                print _("No advisory information available\n")
>+                print "No advisory information available\n"
>     print
> 
> def printSkippedPackages(skippedUpdates):
>     cfg = config.initUp2dateConfig()
>-    print _("The following Packages were marked to be skipped by your configuration:")
>-    print _("""
>+    print "The following Packages were marked to be skipped by your configuration:"
>+    print """
> Name                                    Version        Rel  Reason
>--------------------------------------------------------------------------------""")
>+-------------------------------------------------------------------------------"""
>     for pkg,reason in skippedUpdates:
>         print "%-40s%-15s%-5s%s" % (pkg[0], pkg[1], pkg[2], reason)
>         if cfg["debug"]:
>@@ -339,24 +338,24 @@ Name                                    
>                     topic = string.join(string.split(a['topic']), ' ')
>                     print "[%s] %s\n" % (a['advisory'], topic)
>             else:
>-                print _("No advisory information available\n")
>+                print "No advisory information available\n"
>     print
> 
> def printEmptyGlobsWarning(listOfGlobs):
>-    print _("The following wildcards did not match any packages:")
>+    print "The following wildcards did not match any packages:"
>     for token in listOfGlobs:
>         print token
> 
> def printEmptyCompsWarning(listOfComps):
>-    print _("The following groups did not match any packages:")
>+    print "The following groups did not match any packages:"
>     for token in listOfComps:
>         print token
> 
> def printObsoletedPackages(obsoletedPackages):
>-    print _("The following Packages are obsoleted by newer packages:")
>-    print _("""
>+    print "The following Packages are obsoleted by newer packages:"
>+    print """
> Name-Version-Release        obsoleted by      Name-Version-Release
>--------------------------------------------------------------------------------""")
>+-------------------------------------------------------------------------------"""
>     for (obs,newpackages) in obsoletedPackages:
>         obsstr = "%s-%s-%s" % (obs[0],obs[1],obs[2])
>         newpackage = newpackages[0]
>@@ -368,10 +367,10 @@ Name-Version-Release        obsoleted by
>             print "%-40s%-40s\n" % ("", newstr)
>                                        
> def  printInstalledObsoletingPackages(installedObsoletingPackages):
>-    print _("The following packages were not installed because they are obsoleted by installed packages:")
>-    print _("""
>+    print "The following packages were not installed because they are obsoleted by installed packages:"
>+    print """
> Name-Version-Release       obsoleted by      Name-Version-Release
>--------------------------------------------------------------------------------""")
>+-------------------------------------------------------------------------------"""
>     for (obsoleted, obsoleting) in installedObsoletingPackages:
>         obsstr = "%s-%s-%s" % (obsoleted[0],obsoleted[1],obsoleted[2])
>         print "%-40s%-40s" % (obsstr, obsoleting[0])
>@@ -379,10 +378,10 @@ Name-Version-Release       obsoleted by 
>             print "%-40s%-40s" % (obsstr, obsoletingstr)
> 
> def printAvailablePackages(availablePackages):
>-    print _("The following packages are not installed but available from Red Hat Network:")
>-    print _("""
>+    print "The following packages are not installed but available from Red Hat Network:"
>+    print """
> Name                                    Version        Release  
>---------------------------------------------------------------""")
>+--------------------------------------------------------------"""
>     for pkg in availablePackages:
>         print "%-40s%-14s%-14s" % (pkg[0], pkg[1], pkg[2])
>     print

Actions: View | Diff

Attachments on bug 684899: 703048