Merge "Always strip package comments"
diff --git a/functions-common b/functions-common
index 8e52853..ed444bb 100644
--- a/functions-common
+++ b/functions-common
@@ -1096,8 +1096,9 @@
                 continue
             fi
 
-            # Assume we want this package
-            package=${line%#*}
+            # Assume we want this package; free-form
+            # comments allowed after a #
+            package=${line%%#*}
             inst_pkg=1
 
             # Look for # dist:xxx in comment