extras-buildsys/server PackageJob.py,1.31.2.10.4.1,1.31.2.10.4.2

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6237/server

Modified Files:
      Tag: Plague-0_4_5
	PackageJob.py 
Log Message:
plague-0.4.4.1-preperrormsg.patch




Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.31.2.10.4.1
retrieving revision 1.31.2.10.4.2
diff -u -r1.31.2.10.4.1 -r1.31.2.10.4.2
--- PackageJob.py	31 Jan 2008 13:57:26 -0000	1.31.2.10.4.1
+++ PackageJob.py	31 Jan 2008 14:02:38 -0000	1.31.2.10.4.2
@@ -21,7 +21,8 @@
 import commands
 import threading
 import time
-import rpmUtils
+import rpmUtils.transaction
+import rpmUtils.miscutils
 import exceptions
 import shutil
 import copy
@@ -47,11 +48,11 @@
     print stuff
 
 class PrepError(exceptions.Exception):
-    def __init__(self, args=None):
+    def __init__(self, msg):
         exceptions.Exception.__init__(self)
-        self.args = args
+        self.msg = msg
     def __str__(self):
-        return self.args
+        return self.msg
         
 class BuildError(exceptions.Exception):
     def __init__(self, msg, arch):
@@ -553,8 +554,8 @@
             if self.use_cvs == True:
                 shutil.rmtree(self.checkout_tmpdir, ignore_errors=True)
             subj = 'Prep Error (Job %s): %s on %s' % (self.uid, self._source, self._target_str)
-            self.email_result(self.username, resultstring=e.args, subject=subj)
-            self._stage_failed(e.args)
+            self.email_result(self.username, resultstring=e.msg, subject=subj)
+            self._stage_failed(e.msg)
         except BuildError, e:
             subj = 'Build Error (Job %s): %s on %s' % (self.uid, self._source, self._target_str)
             base_url = self._server_cfg.get_str("UI", "log_url")