diff --git a/scripts/include_folder.py b/scripts/include_folder.py index 534dd8f9..1549b085 100644 --- a/scripts/include_folder.py +++ b/scripts/include_folder.py @@ -49,11 +49,12 @@ (options.folders, [os.listdir(f) for f in options.folders])) valid_changes = [c for c in changefiles if c.content['Binary'] == options.package] +invalid_changes = [c.content['Binary'] for c in changefiles if c.content['Binary'] != options.package] 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') diff --git a/src/reprepro_updater/changes_parsing.py b/src/reprepro_updater/changes_parsing.py index e7a37615..088fdc2c 100644 --- a/src/reprepro_updater/changes_parsing.py +++ b/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 = []