Control: tags -1 +patch

Thanks again for the bug report! Pretty amazing that no one noticed this
major bug before...

I have fixed this in git, with the following patch.

commit e2ddadcf643fd42a749c16cb9664a6fd3d5b76e1
Author: Antoine Beaupré <anar...@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 4dcfc97..456cf3b 100644
--- a/monkeysign/gpg.py
+++ b/monkeysign/gpg.py
@@ -426,7 +426,6 @@ def del_uid(self, fingerprint, pattern):
         while True:
             m = self.context.seek_pattern(proc.stdout, 
'^uid:.::::::::([^:]*):::[^:]*:(\d+),[^:]*:')
             if m and m.group(1) == pattern:
-                # XXX: we don't have the +1 that sign_key has, why?
                 index = int(m.group(2))
                 break
         self.context.write(proc.stdin, str(index))
@@ -513,7 +512,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
             self.context.write(proc.stdin, str(index))
             self.context.expect(proc.stderr, 'GOT_IT')


-- 
Tout ce qui n’est pas donné est perdu.
                        - Proverbe indien

Attachment: signature.asc
Description: PGP signature

Reply via email to