Merge ~sylvain-pineau/checkbox/+git/support:fixes into ~checkbox-dev/checkbox/+git/support:master

[Sylvain Pineau]

Fixes for the release tools

[Sylvain Pineau (sylvain-pineau)]

self-approved

review: Approve

diff --git a/release/git/lp-roadmap-query b/release/git/lp-roadmap-query
index e76c3b8..7b59730 100755
--- a/release/git/lp-roadmap-query
+++ b/release/git/lp-roadmap-query
@@ -50,14 +50,16 @@ def main():
     packages = {
         'checkbox-support': 'Checkbox Support Library',
         'plainbox': 'PlainBox (Toolkit)',
-        'plainbox-provider-certification-client': 'Canonical Certification '
-                                                  'Client Provider '
-                                                  'for PlainBox',
-        'plainbox-provider-certification-server': 'Canonical Certification '
-                                                  'Server Provider '
-                                                  'for PlainBox',
-        'plainbox-provider-checkbox': 'Checkbox Provider for PlainBox',
-        'plainbox-provider-resource': 'Resource Provider for PlainBox',
+        'plainbox-provider-certification-client': 'Provider for Plainbox - '
+                                                  'Canonical Certification '
+                                                  'Client',
+        'plainbox-provider-certification-server': 'Provider for Plainbox - '
+                                                  'Canonical Certification '
+                                                  'Server',
+        'plainbox-provider-checkbox': 'Provider for Plainbox - Checkbox',
+        'plainbox-provider-resource': 'Provider for Plainbox - Resource',
+        'plainbox-provider-sru': 'Provider for Plainbox - SRU',
+        'plainbox-provider-tpm2': 'Provider for Plainbox - TPM2',
         'checkbox-ng': 'Next Generation Checkbox (CLI)',
         'checkbox-converged': 'Checkbox Converged',
     }
@@ -81,8 +83,8 @@ def main():
         for m in sorted(matching_milestone, key=lambda m: m.date_targeted):
             if m.date_targeted.isoformat() not in milestone_codes:
                 milestone_codes[m.date_targeted.isoformat()] = ""
-            mi_codes = [mi["value"] for mi in milestones if "{} {}".format(
-                    packages[p], m.name) in mi["id"]]
+            mi_codes = [mi["value"] for mi in milestones if re.search(
+                "{}\s+{}".format(packages[p], m.name), mi["id"])]
             if mi_codes:
                 milestone_codes[m.date_targeted.isoformat()] += \
                     "&field.milestone%3Alist={}".format(mi_codes[-1])
diff --git a/release/git/release_me.py b/release/git/release_me.py
index 0da3075..4e0149e 100755
--- a/release/git/release_me.py
+++ b/release/git/release_me.py
@@ -238,8 +238,15 @@ class Release(Command):
             version_pattern = '*[^c][0-9]'  # Up to 9 RC :)
         code_change = run(
             'git diff $(git describe --abbrev=0 --tags --match '
-            '"v{}") --name-only'.format(version_pattern),
+            '"v{}") -- . ":(exclude).*ignore"'.format(version_pattern),
             shell=True, cwd=project, check=True).stdout
+        version_change = run(
+            'git diff $(git describe --abbrev=0 --tags --match "v{}")'
+            ' -G "__version__|current_version|version="'.format(
+                version_pattern),
+            shell=True, cwd=project, check=True).stdout
+        if code_change == version_change:
+            code_change = False
         packaging_change = run(
             'git diff $(git describe --abbrev=0 --tags --match '
             '"debian-{}") --name-only'.format(version_pattern),