canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+463809@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging ~andersson123/autopkgtest-cloud:generate-charm-inventory-amendment into autopkgtest-cloud:master.

Requested reviews:
  Canonical's Ubuntu QA (canonical-ubuntu-qa)

For more details, see:
https://code.launchpad.net/~andersson123/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/463809
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~andersson123/autopkgtest-cloud:generate-charm-inventory-amendment into autopkgtest-cloud:master.

diff --git a/dev-tools/generate-charm-inventory b/dev-tools/generate-charm-inventory
index 2aa5785..7a9e02a 100755
--- a/dev-tools/generate-charm-inventory
+++ b/dev-tools/generate-charm-inventory
@@ -30,7 +30,7 @@ commits = {
 for commit in repo.iter_commits(branch, max_count=1000):
     if str(commit) == up_to:
         break
-    if "Merge branch" in commit.message:
+    if commit.message.startswith("Merge "):
         continue
     if "web: " in commit.message:
         commits["web"].append(