[yum-commits] Branch 'yum-3_2_X' - 3 commits - README yum/rpmtrans.py

[skvidal at osuosl.org]

 README          |    4 ++--
 yum/rpmtrans.py |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 03834ae5779b1652d0c7ad4bc325acf153b35154
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Mon Feb 16 11:49:24 2009 -0500

    fixup a merge failure

diff --git a/yum/rpmtrans.py b/yum/rpmtrans.py
index 15d0bcd..298a5e9 100644
--- a/yum/rpmtrans.py
+++ b/yum/rpmtrans.py
@@ -514,16 +514,12 @@ class RPMTransaction:
             # "total" carries fatal/non-fatal status
             scriptlet_name = rpm.tagnames.get(bytes, "<unknown>")
             if total:
-                msg = "Error in %s scriptlet in rpm package %s" % (rpm.tagnames[tagnum], txmbr.po)
+                msg = ("Error in %s scriptlet in rpm package %s" % 
+                        (rpm.tagnames[tagnum], txmbr.po))
                 txmbr.output_state = TS_FAILED
             else:
-                msg = "Non-fatal %s scriptlet failure in rpm package %s" % (rpm.tagnames[tagnum], txmbr.po)
-                msg = ("Error in %s scriptlet in rpm package %s" %
-                       (scriptlet_name, txmbr.po))
-                txmbr.output_state = TS_FAILED
-            else:
-                msg = ("Non-fatal %s scriptlet failure in rpm package %s" %
-                       (scriptlet_name, txmbr.po))
+                msg = ("Non-fatal %s scriptlet failure in rpm package %s" % 
+                       (rpm.tagnames[tagnum], txmbr.po))
             self.display.errorlog(msg)
             # FIXME - what else should we do here? raise a failure and abort?
     
commit 08f16c15b77225bf15e9b1e184ca8729502226c2
Merge: 477df12... 3645f0a...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Fri Feb 13 14:32:38 2009 -0500

    Merge branch 'yum-3_2_X' of ssh://yum.baseurl.org/srv/projects/yum/git/yum into yum-3_2_X
    
    * 'yum-3_2_X' of ssh://yum.baseurl.org/srv/projects/yum/git/yum:
      Don't traceback when rpm gives us a bad tagname, BZ 485221
      Sort pkgs in --version
      Use user cache dirs. instead of going cache-only, BZ 460782
    
    Conflicts:
    	yum/rpmtrans.py

diff --cc README
index ca0c1b4,ca0c1b4..c3570fd
--- a/README
+++ b/README
@@@ -26,8 -26,8 +26,8 @@@ Yum is run with one of the following op
  
  See the man page for more information (man yum)
  Also see the webpage and wiki for more information:
--web page: http://linux.duke.edu/yum/
--wiki: http://wiki.linux.duke.edu/Yum
++web page: http://yum.baseurl.org/
++wiki: http://yum.baseurl.org/wiki
  
  3.2.X Branch - yum-3_2_X
        Starting commit is roughly: a3c91d7f6a15f31a42d020127b2da2877dfc137d
diff --cc yum/rpmtrans.py
index 314991e,8bc8e1a..15d0bcd
--- a/yum/rpmtrans.py
+++ b/yum/rpmtrans.py
@@@ -511,17 -511,15 +511,19 @@@ class RPMTransaction
          txmbrs = self.base.tsInfo.getMembers(pkgtup=pkgtup)
          for txmbr in txmbrs:
              # "bytes" carries the failed scriptlet tag,
-             # apparently it carries it as a Long?!
-             if type(bytes) == type(1L):
-                 tagnum = int(bytes)
-             else:
-                 tagnum = bytes
              # "total" carries fatal/non-fatal status
+             scriptlet_name = rpm.tagnames.get(bytes, "<unknown>")
              if total:
 +                msg = "Error in %s scriptlet in rpm package %s" % (rpm.tagnames[tagnum], txmbr.po)
 +                txmbr.output_state = TS_FAILED
 +            else:
 +                msg = "Non-fatal %s scriptlet failure in rpm package %s" % (rpm.tagnames[tagnum], txmbr.po)
+                 msg = ("Error in %s scriptlet in rpm package %s" %
+                        (scriptlet_name, txmbr.po))
+                 txmbr.output_state = TS_FAILED
+             else:
+                 msg = ("Non-fatal %s scriptlet failure in rpm package %s" %
+                        (scriptlet_name, txmbr.po))
              self.display.errorlog(msg)
              # FIXME - what else should we do here? raise a failure and abort?
      
commit 477df12dd3ea2456188caa26a38e131b603abc65
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Thu Feb 12 10:17:50 2009 -0500

    fix for rh bug #485221
    make sure the type of 'bytes' is an int for passing into the hdr dict.

diff --git a/yum/rpmtrans.py b/yum/rpmtrans.py
index 85896fa..314991e 100644
--- a/yum/rpmtrans.py
+++ b/yum/rpmtrans.py
@@ -511,12 +511,17 @@ class RPMTransaction:
         txmbrs = self.base.tsInfo.getMembers(pkgtup=pkgtup)
         for txmbr in txmbrs:
             # "bytes" carries the failed scriptlet tag,
+            # apparently it carries it as a Long?!
+            if type(bytes) == type(1L):
+                tagnum = int(bytes)
+            else:
+                tagnum = bytes
             # "total" carries fatal/non-fatal status
             if total:
-                msg = "Error in %s scriptlet in rpm package %s" % (rpm.tagnames[bytes], txmbr.po)
+                msg = "Error in %s scriptlet in rpm package %s" % (rpm.tagnames[tagnum], txmbr.po)
                 txmbr.output_state = TS_FAILED
             else:
-                msg = "Non-fatal %s scriptlet failure in rpm package %s" % (rpm.tagnames[bytes], txmbr.po)
+                msg = "Non-fatal %s scriptlet failure in rpm package %s" % (rpm.tagnames[tagnum], txmbr.po)
             self.display.errorlog(msg)
             # FIXME - what else should we do here? raise a failure and abort?