pld-builder.new: PLD_Builder/request_fetcher.py, PLD_Builder/rpm_builder.py...

[arekm]

Author: arekm                        Date: Fri Jul 18 11:46:18 2008 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
String exceptions are deprecated. Fix that.

---- Files affected:
pld-builder.new/PLD_Builder:
   request_fetcher.py (1.22 -> 1.23) , rpm_builder.py (1.61 -> 1.62) , srpm_builder.py (1.50 -> 1.51) , util.py (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/request_fetcher.py
diff -u pld-builder.new/PLD_Builder/request_fetcher.py:1.22 pld-builder.new/PLD_Builder/request_fetcher.py:1.23
--- pld-builder.new/PLD_Builder/request_fetcher.py:1.22	Thu Jul 17 12:50:32 2008
+++ pld-builder.new/PLD_Builder/request_fetcher.py	Fri Jul 18 13:46:13 2008
@@ -89,7 +89,7 @@
     q.read()
     for r in reqs:
         if r.kind != 'group': 
-            raise 'handle_reqs: fatal: huh? %s' % r.kind
+            raise Exception, 'handle_reqs: fatal: huh? %s' % r.kind
         need_it = 0
         for b in r.batches:
             if builder in b.builders:

================================================================
Index: pld-builder.new/PLD_Builder/rpm_builder.py
diff -u pld-builder.new/PLD_Builder/rpm_builder.py:1.61 pld-builder.new/PLD_Builder/rpm_builder.py:1.62
--- pld-builder.new/PLD_Builder/rpm_builder.py:1.61	Thu Jul 17 18:03:27 2008
+++ pld-builder.new/PLD_Builder/rpm_builder.py	Fri Jul 18 13:46:13 2008
@@ -42,7 +42,7 @@
 def pick_request(q):
     def mycmp(r1, r2):
         if r1.kind != 'group' or r2.kind != 'group':
-            raise "non-group requests"
+            raise Exception, "non-group requests"
         pri_diff = cmp(r1.priority, r2.priority)
         if pri_diff == 0:
             return cmp(r1.time, r2.time)
@@ -268,7 +268,7 @@
     
 def main():
     if len(sys.argv) < 2:
-        raise "fatal: need to have builder name as first arg"
+        raise Exception, "fatal: need to have builder name as first arg"
     return main_for(sys.argv[1])
     
 if __name__ == '__main__':

================================================================
Index: pld-builder.new/PLD_Builder/srpm_builder.py
diff -u pld-builder.new/PLD_Builder/srpm_builder.py:1.50 pld-builder.new/PLD_Builder/srpm_builder.py:1.51
--- pld-builder.new/PLD_Builder/srpm_builder.py:1.50	Fri Jun 27 19:21:35 2008
+++ pld-builder.new/PLD_Builder/srpm_builder.py	Fri Jul 18 13:46:13 2008
@@ -29,7 +29,7 @@
 def pick_request(q):
     def mycmp(r1, r2):
         if r1.kind != 'group' or r2.kind != 'group':
-            raise "non-group requests"
+            raise Exception, "non-group requests"
         pri_diff = cmp(r1.priority, r2.priority)
         if pri_diff == 0:
             return cmp(r1.time, r2.time)

================================================================
Index: pld-builder.new/PLD_Builder/util.py
diff -u pld-builder.new/PLD_Builder/util.py:1.9 pld-builder.new/PLD_Builder/util.py:1.10
--- pld-builder.new/PLD_Builder/util.py:1.9	Sun Jun 22 14:30:28 2008
+++ pld-builder.new/PLD_Builder/util.py	Fri Jul 18 13:46:13 2008
@@ -14,7 +14,7 @@
     u = string.strip(f.read())
     f.close()
     if len(u) != 36:
-        raise "uuid: fatal, cannot generate uuid: %s" % u
+        raise Exception, "uuid: fatal, cannot generate uuid: %s" % u
     return u
 
 # uuid module available in python >= 2.5
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/request_fetcher.py?r1=1.22&r2=1.23&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/rpm_builder.py?r1=1.61&r2=1.62&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/srpm_builder.py?r1=1.50&r2=1.51&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/util.py?r1=1.9&r2=1.10&f=u