Merge ~hopem/stsstack-bundles:revision-info-fixes into stsstack-bundles:master

[Edward Hope-Morley]

[Nicolas Bock (nicolasbock)]

review: Needs Fixing

[Edward Hope-Morley (hopem)]

all fixed

[Nicolas Bock (nicolasbock)]

LGTM

review: Approve

diff --git a/common/helpers b/common/helpers
index 3aba5bd..ddfb55e 100644
--- a/common/helpers
+++ b/common/helpers
@@ -192,12 +192,14 @@ filter_master_opts ()
                     exit 1
                 fi
                 readarray -t temp < <("$MOD_DIR/../tools/parse-bundle.py" --get-charms $2)
-                for line in "${temp[@]}"; do
-                    read -a temp -r <<< ${line}
-                    MASTER_OPTS[CHARM_REVISIONS.${temp[0]}]=${temp[1]}
-                done
-                echo "INFO: enabling stable charms since version info provided."
-                CACHED_STDIN=( "${CACHED_STDIN[@]}" --use-stable-charms )
+                if ((${#temp[@]})); then
+                    for line in "${temp[@]}"; do
+                        read -a temp -r <<< ${line}
+                        MASTER_OPTS[CHARM_REVISIONS.${temp[0]}]=${temp[1]}
+                    done
+                    echo -e "INFO: enabling stable charms since version info provided\n"
+                    CACHED_STDIN=( "${CACHED_STDIN[@]}" --use-stable-charms )
+                fi
                 shift
                 ;;
             --debug)
diff --git a/tools/parse-bundle.py b/tools/parse-bundle.py
index 755cc5d..23bb594 100755
--- a/tools/parse-bundle.py
+++ b/tools/parse-bundle.py
@@ -5,7 +5,9 @@ import yaml
 import re
 import sys
 
-charm_match = re.compile("cs:[a-z0-9\-]+-[0-9]+\s*$")
+lpid = r"([~a-z0-9\-]+/)?"
+charm = r"([a-z0-9\-]+)"
+charm_match = re.compile(r".*cs:{}{}-([0-9]+)\s*$".format(lpid, charm))
 
 
 def parse_arguments():
@@ -29,13 +31,27 @@ def get_charms(bundle):
 
 
 def process(bundle_file, options):
+    versions_found = False
+    invalid_charms = []
     bundle = yaml.load(bundle_file, Loader=yaml.SafeLoader)
     if options.get_charms:
         charms = get_charms(bundle)
         for app in charms:
             ret = charm_match.match(charms[app])
             if ret:
-                print(app, charms[app])
+                if ret.group(1):
+                    invalid_charms.append(ret.group(2))
+                else:
+                    versions_found = True
+                    print(ret.group(2), charms[app])
+
+    if not versions_found:
+        sys.stderr.write("WARNING: no valid charm revisions found in {}\n\n".
+                         format(bundle_file.name))
+    elif invalid_charms:
+        sys.stderr.write("WARNING: ignoring version info for non-stable "
+                         "charm(s): ")
+        sys.stderr.write("{}\n\n".format(', '.join(invalid_charms)))
 
 
 def main():