Ansgar pushed to branch master at Debian FTP Team / dak
Commits:
-
2005a5c2
by Niels Thykier at 2020-01-02T12:17:13+00:00
-
ab9eb092
by Niels Thykier at 2020-01-02T12:17:22+00:00
-
a338e4d2
by Niels Thykier at 2020-01-02T12:17:30+00:00
-
7ef7d6f8
by Niels Thykier at 2020-01-02T12:35:47+00:00
-
4c4ee6e9
by Ansgar at 2020-01-02T23:52:25+09:00
2 changed files:
Changes:
| ... | ... | @@ -375,7 +375,7 @@ def main(): |
| 375 | 375 |
('p', "patchname", "Generate-Index-Diffs::Options::PatchName", "hasArg"),
|
| 376 | 376 |
('d', "tmpdir", "Generate-Index-Diffs::Options::TempDir", "hasArg"),
|
| 377 | 377 |
('m', "maxdiffs", "Generate-Index-Diffs::Options::MaxDiffs", "hasArg"),
|
| 378 |
- ('n', "n-act", "Generate-Index-Diffs::Options::NoAct"),
|
|
| 378 |
+ ('n', "no-act", "Generate-Index-Diffs::Options::NoAct"),
|
|
| 379 | 379 |
('v', "verbose", "Generate-Index-Diffs::Options::Verbose"),
|
| 380 | 380 |
]
|
| 381 | 381 |
suites = apt_pkg.parse_commandline(Cnf, Arguments, sys.argv)
|
| ... | ... | @@ -397,7 +397,7 @@ def main(): |
| 397 | 397 |
if not suites:
|
| 398 | 398 |
query = session.query(Suite.suite_name)
|
| 399 | 399 |
if Options.get('Archive'):
|
| 400 |
- archives = [a.strip() for a in Options['Archive'].split(',')]
|
|
| 400 |
+ archives = utils.split_args(Options['Archive'])
|
|
| 401 | 401 |
query = query.join(Suite.archive).filter(Archive.archive_name.in_(archives))
|
| 402 | 402 |
suites = [s.suite_name for s in query]
|
| 403 | 403 |
|
| ... | ... | @@ -60,7 +60,7 @@ setup_debian_like_archive() { |
| 60 | 60 |
changelog=dists/testing/ChangeLog \
|
| 61 | 61 |
overrideprocess=True overrideorigin=unstable
|
| 62 | 62 |
|
| 63 |
- dak admin suite add-all-arches testing-debug "" codename=sid-debug archive=debian-debug
|
|
| 63 |
+ dak admin suite add-all-arches testing-debug "" codename=buster-debug archive=debian-debug
|
|
| 64 | 64 |
dak admin suite-component add testing-debug main contrib non-free
|
| 65 | 65 |
dak admin suite-config set testing-debug allowcsset=no byhash=yes \
|
| 66 | 66 |
accept_binary_uploads=False accept_source_uploads=False
|
| ... | ... | @@ -177,7 +177,6 @@ dinstall_stage_packages_contents() { |
| 177 | 177 |
dinstall_stage_dists() {
|
| 178 | 178 |
# run pdiff
|
| 179 | 179 |
echo "Generating pdiff files"
|
| 180 |
- rm -fr "${pdiff_tempdir}"
|
|
| 181 | 180 |
mkdir -p "${pdiff_tempdir}"
|
| 182 | 181 |
dak generate-index-diffs -d "${pdiff_tempdir}" -a "${public_archives[*]}"
|
| 183 | 182 |
# run release files
|