Merge remote-tracking branch 'origin/merge-requests/166'

dak/generate_index_diffs.py

@@ -375,7 +375,7 @@ def main():
                   ('p', "patchname", "Generate-Index-Diffs::Options::PatchName", "hasArg"),
                   ('d', "tmpdir", "Generate-Index-Diffs::Options::TempDir", "hasArg"),
                   ('m', "maxdiffs", "Generate-Index-Diffs::Options::MaxDiffs", "hasArg"),
-                  ('n', "n-act", "Generate-Index-Diffs::Options::NoAct"),
+                  ('n', "no-act", "Generate-Index-Diffs::Options::NoAct"),
                   ('v', "verbose", "Generate-Index-Diffs::Options::Verbose"),
                 ]
     suites = apt_pkg.parse_commandline(Cnf, Arguments, sys.argv)
@@ -397,7 +397,7 @@ def main():
     if not suites:
         query = session.query(Suite.suite_name)
         if Options.get('Archive'):
-            archives = [a.strip() for a in Options['Archive'].split(',')]
+            archives = utils.split_args(Options['Archive'])
             query = query.join(Suite.archive).filter(Archive.archive_name.in_(archives))
         suites = [s.suite_name for s in query]
 

integration-tests/dinstall

@@ -60,7 +60,7 @@ setup_debian_like_archive() {
         changelog=dists/testing/ChangeLog \
         overrideprocess=True overrideorigin=unstable
 
-    dak admin suite add-all-arches testing-debug "" codename=sid-debug archive=debian-debug
+    dak admin suite add-all-arches testing-debug "" codename=buster-debug archive=debian-debug
     dak admin suite-component add testing-debug main contrib non-free
     dak admin suite-config set testing-debug allowcsset=no byhash=yes \
         accept_binary_uploads=False accept_source_uploads=False
@@ -177,7 +177,6 @@ dinstall_stage_packages_contents() {
 dinstall_stage_dists() {
     # run pdiff
     echo "Generating pdiff files"
-    rm -fr "${pdiff_tempdir}"
     mkdir -p "${pdiff_tempdir}"
     dak generate-index-diffs -d "${pdiff_tempdir}" -a "${public_archives[*]}"
     # run release files