duplicity-team team mailing list archive

[Michael Terry <mike@xxxxxxxxxxx>]

Michael Terry has proposed merging lp:~mterry/duplicity/gpg-tag-versions into lp:duplicity.

Requested reviews:
  duplicity-team (duplicity-team)

For more details, see:
https://code.launchpad.net/~mterry/duplicity/gpg-tag-versions/+merge/329693

Support gpg versions numbers that have tags on them.

This can happen if you build gpg from git trunk (e.g. 2.1.15-beta20).  Or if you run against the freedesktop flatpak runtime (e.g. 2.1.14-unknown).

This could be applied to 0.7-series too.  Should I make a separate branch like I've been doing or is that easier to cherry-pick in yourself?
-- 
Your team duplicity-team is requested to review the proposed merge of lp:~mterry/duplicity/gpg-tag-versions into lp:duplicity.

=== modified file 'duplicity/gpg.py'
--- duplicity/gpg.py	2017-07-11 14:55:38 +0000
+++ duplicity/gpg.py	2017-08-27 17:31:30 +0000
@@ -91,7 +91,7 @@
 
         self.gpg_version = self.get_gpg_version(globals.gpg_binary)
 
-    _version_re = re.compile(r'^gpg.*\(GnuPG(?:/MacGPG2)?\) (?P<maj>[0-9]+)\.(?P<min>[0-9]+)\.(?P<bug>[0-9]+)$')
+    _version_re = re.compile(r'^gpg.*\(GnuPG(?:/MacGPG2)?\) (?P<maj>[0-9]+)\.(?P<min>[0-9]+)\.(?P<bug>[0-9]+)(-.+)?$')
 
     def get_gpg_version(self, binary):
         gpg = gpginterface.GnuPG()