[yum-commits] Branch 'yum-3_2_X' - 3 commits - yum/__init__.py yum/pgpmsg.py

[James Antill]

 yum/__init__.py |    2 +-
 yum/pgpmsg.py   |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 09abcbaf366b0e626a65a190df4b0d140457f4ee
Merge: ed07308... 5427683...
Author: James Antill <james at and.org>
Date:   Thu Jan 28 10:15:31 2010 -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:
      stop format_missing_requires from exploding, if ayum is not set (current yumex uses DepSolveProgressCallback(), fixed upstream to use DepSolveProgressCallback(ayum=self), but other users can hit this too) (rhbz #558770)

commit ed0730848ffe7f8aa5e5431ac18162f0cc3efddf
Author: Josh Stone <jistone at redhat.com>
Date:   Wed Jan 27 23:30:32 2010 -0500

    Fix typo for errsting, in returnPackageByDep()

diff --git a/yum/__init__.py b/yum/__init__.py
index 70ac05c..e610626 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -2544,7 +2544,7 @@ class YumBase(depsolve.Depsolve):
         # we get all sorts of randomness here
         errstring = depstring
         if type(depstring) not in types.StringTypes:
-            errtring = str(depstring)
+            errstring = str(depstring)
         
         try:
             pkglist = self.returnPackagesByDep(depstring)
commit 4ef06b9d1bf6685095a69dbefda0241a9401b0cd
Author: James Antill <james at and.org>
Date:   Wed Jan 27 18:05:04 2010 -0500

    Fix API break from pgpmsg update, can't import new keys without this

diff --git a/yum/pgpmsg.py b/yum/pgpmsg.py
index 1ac41d7..f8dccdb 100644
--- a/yum/pgpmsg.py
+++ b/yum/pgpmsg.py
@@ -1235,6 +1235,7 @@ a PGP "certificate" includes a public key, user id(s), and signature.
             cert_list = []
             while len(pkt_list) > 0 :
                 cert = pgp_certificate()
+                cert.raw_key = msg
                 pkt_idx = cert.load(pkt_list)
                 cert_list.append(cert)
                 pkt_list[0:pkt_idx] = []