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

skvidal at osuosl.org skvidal at osuosl.org
Thu Aug 12 16:11:24 UTC 2010


 yum/pgpmsg.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fd449dbb1030d725cca654de71542c3617577b86
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Thu Aug 12 12:01:46 2010 -0400

    don't break when we import a single key from a single file
    
    this fixes the multiple-key api-fix from f5a7625e93ee701fd1dc27b04bc040e8113a2e39

diff --git a/yum/pgpmsg.py b/yum/pgpmsg.py
index 9f58fad..b23eabc 100644
--- a/yum/pgpmsg.py
+++ b/yum/pgpmsg.py
@@ -1272,7 +1272,7 @@ def decode_multiple_keys(msg):
         block += '%s\n' % l
         if l == '-----END PGP PUBLIC KEY BLOCK-----':
             in_block = 0
-            thesecerts = decode_msg(block)
+            thesecerts = decode_msg(block, multi=True)
             if thesecerts:
                 certs.extend(thesecerts)
             block = ''


More information about the Yum-commits mailing list