[gnome-keysign: 45/75] Merged colon UIDs

[Gitlab System User <gitlab src gnome org>]

commit 6cf9897fe501dbec807ba7edb65b660a08e5bfb8
Merge: 27bbf03 5e839c4
Author: Tobias Mueller <muelli cryptobitch de>
Date:   Sun Jul 23 15:08:28 2017 +0200

    Merged colon UIDs
    
    I hope this conflict resolution is correct.  My worry is that the
    equality check always succeeds, because monkeysign does not return the
    unescaped in the key's.uidlist.  However, the test case seems to be
    happy with this change and unhappy with key_uid = u.uid.
    Hooray for tests.

 keysign/gpgmks.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --cc keysign/gpgmks.py
index a632b37,6701937..8c097b3
--- a/keysign/gpgmks.py
+++ b/keysign/gpgmks.py
@@@ -58,8 -57,10 +58,10 @@@ def UIDExport(uid, keydata)
              key_uid = decode_gpg_uid(u.uid)
              if key_uid != uid:
                  log.info('Deleting UID %s from key %s', key_uid, fpr)
-                 tmp.del_uid(fingerprint=fpr, pattern=key_uid)
+                 # As pattern we need to provide the unescaped one, otherwise monkeysign
+                 # will hang trying to find the correct uid to delete
+                 tmp.del_uid(fingerprint=fpr, pattern=u.uid)
 -    only_uid = tmp.export_data(uid)
 +    only_uid = tmp.export_data(fpr)
  
      return only_uid