[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#771033: unblock: monkeysign/2.0.2 (pre-approval)



when it rains, it pours... i also would like to add the patch from
#771034:

commit 43b8bc41be45c5f9b734ac239bba8f2ddca60979
Author: Antoine Beaupré <anarcat@koumbit.org>
Date:   Tue Nov 25 23:26:00 2014 -0500

    use the proper index when selecting key to sign (closes #771034)
    
    before this patch, we would miss the selected key off by one
    
    thanks to jerome for debugging

diff --git a/monkeysign/gpg.py b/monkeysign/gpg.py
index 15164d7..be3c54c 100644
--- a/monkeysign/gpg.py
+++ b/monkeysign/gpg.py
@@ -503,7 +503,7 @@ def sign_key(self, pattern, signall = False, local = False):
                 # XXX: this will hang if the pattern requested is not found, we need a better way!
                 m = self.context.seek_pattern(proc.stdout, '^uid:.::::::::([^:]*):::[^:]*:(\d+),[^:]*:')
                 if m and m.group(1) == pattern:
-                    index = int(m.group(2)) + 1
+                    index = int(m.group(2))
                     break
             print >>proc.stdin, str(index)
             self.context.expect(proc.stderr, 'GOT_IT')

thanks!

a.

-- 
From the age of uniformity, from the age of solitude, from the age of
Big Brother, from the age of doublethink - greetings!
                        - Winston Smith, 1984

Attachment: signature.asc
Description: PGP signature


Reply to: