canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+461964@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging ~andersson123/autopkgtest-cloud:charm-inventory-amendments 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/461964
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~andersson123/autopkgtest-cloud:charm-inventory-amendments into autopkgtest-cloud:master.

diff --git a/dev-tools/generate-charm-inventory b/dev-tools/generate-charm-inventory
index 2aa5785..3758b0c 100755
--- a/dev-tools/generate-charm-inventory
+++ b/dev-tools/generate-charm-inventory
@@ -26,12 +26,14 @@ commits = {
     "cloud": [],
     "misc": [],
 }
+changed_files = []
 
 for commit in repo.iter_commits(branch, max_count=1000):
     if str(commit) == up_to:
         break
-    if "Merge branch" in commit.message:
+    if str(commit.message).startswith("Merge "):
         continue
+    changed_files += commit.stats.files
     if "web: " in commit.message:
         commits["web"].append(
             "- [%s](%s%s)"
@@ -52,4 +54,6 @@ inventory = ""
 for key, item in commits.items():
     inventory += "**%s**\n%s\n" % (key, "\n".join(item))
 
+inventory += "\n**Changed files:**\n" + "\n".join(changed_files)
+
 print(inventory)