Allow multi-package uploads

scripts/include_folder.py

@@ -48,12 +48,13 @@
     parser.error("Folders %s doesn't contain a changes file. %s" %
                  (options.folders, [os.listdir(f) for f in options.folders]))
 
-valid_changes = [c for c in changefiles if c.content['Binary'] == options.package]
+valid_changes = [c for c in changefiles if options.package in c.content['Binary']]
+invalid_changes = [c.content['Binary'] for c in changefiles if not options.package in c.content['Binary']]
 
 extraneous_packages = set(changefiles) - set(valid_changes)
 if extraneous_packages:
     parser.error("Invalid packages detected in folders %s. [%s]" %
-                 (options.folders, extraneous_packages))
+                 (options.folders, invalid_changes))
 
 lockfile = os.path.join(options.repo_path, 'lock')
 

src/reprepro_updater/changes_parsing.py

@@ -13,6 +13,12 @@ def __init__(self, filename):
             raise Exception("Failed to load changes file %s.  [[%s]]" %
                             (filename, ex))
 
+    def __repr__(self):
+        return "ChangesFile(%s)"%(self.filename)
+
+    def __str__(self):
+        return "ChangesFile(%s): %s"%(self.filename, self.content)
+
 
 def find_changes_files(folder):
     changesfiles = []