diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 18:42:36 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 18:42:36 +0000 |
| commit | f3cd649313063ef9d72a3a4a0ab5b4af598c8c9f (patch) | |
| tree | 47e771e246377a3ee1211bdb2238e090970d6c24 /src | |
| parent | Releasing progress-linux version 1.22.5-0.0~progress7.99u1. (diff) | |
| download | dpkg-f3cd649313063ef9d72a3a4a0ab5b4af598c8c9f.tar.xz dpkg-f3cd649313063ef9d72a3a4a0ab5b4af598c8c9f.zip | |
Merging upstream version 1.22.6.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/at/package.m4 | 4 | ||||
| -rwxr-xr-x | src/at/testsuite | 10 | ||||
| -rw-r--r-- | src/deb/main.c | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/at/package.m4 b/src/at/package.m4 index e36d505..e581dd3 100644 --- a/src/at/package.m4 +++ b/src/at/package.m4 @@ -1,7 +1,7 @@ # Signature of the current package. m4_define([AT_PACKAGE_NAME], [dpkg]) m4_define([AT_PACKAGE_TARNAME], [dpkg]) -m4_define([AT_PACKAGE_VERSION], [1.22.5]) -m4_define([AT_PACKAGE_STRING], [dpkg 1.22.5]) +m4_define([AT_PACKAGE_VERSION], [1.22.6]) +m4_define([AT_PACKAGE_STRING], [dpkg 1.22.6]) m4_define([AT_PACKAGE_URL], [https://wiki.debian.org/Teams/Dpkg]) m4_define([AT_PACKAGE_BUGREPORT], [debian-dpkg@lists.debian.org]) diff --git a/src/at/testsuite b/src/at/testsuite index 2bdc028..e982e45 100755 --- a/src/at/testsuite +++ b/src/at/testsuite @@ -1000,7 +1000,7 @@ fi # List of tests. if $at_list_p; then cat <<_ATEOF || at_write_fail=1 -dpkg 1.22.5 test suite: dpkg tools functional test suite test groups: +dpkg 1.22.6 test suite: dpkg tools functional test suite test groups: NUM: FILE-NAME:LINE TEST-GROUP-NAME KEYWORDS @@ -1041,7 +1041,7 @@ _ATEOF exit $at_write_fail fi if $at_version_p; then - printf "%s\n" "$as_me (dpkg 1.22.5)" && + printf "%s\n" "$as_me (dpkg 1.22.6)" && cat <<\_ATEOF || at_write_fail=1 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1241,11 +1241,11 @@ exec 5>>"$at_suite_log" # Banners and logs. printf "%s\n" "## --------------------------------------------------------- ## -## dpkg 1.22.5 test suite: dpkg tools functional test suite. ## +## dpkg 1.22.6 test suite: dpkg tools functional test suite. ## ## --------------------------------------------------------- ##" { printf "%s\n" "## --------------------------------------------------------- ## -## dpkg 1.22.5 test suite: dpkg tools functional test suite. ## +## dpkg 1.22.6 test suite: dpkg tools functional test suite. ## ## --------------------------------------------------------- ##" echo @@ -2105,7 +2105,7 @@ _ASBOX printf "%s\n" "Please send $at_msg and all information you think might help: To: <debian-dpkg@lists.debian.org> - Subject: [dpkg 1.22.5] $as_me: $at_msg1$at_msg2 + Subject: [dpkg 1.22.6] $as_me: $at_msg1$at_msg2 You may investigate any problem if you feel able to do so, in which case the test suite provides a good starting point. Its output may diff --git a/src/deb/main.c b/src/deb/main.c index 0217278..2c53811 100644 --- a/src/deb/main.c +++ b/src/deb/main.c @@ -298,9 +298,6 @@ int main(int argc, const char *const *argv) { if (!cipaction) badusage(_("need an action option")); - if (!compressor_check_params(&compress_params, &err)) - badusage(_("invalid compressor parameters: %s"), err.str); - if (!opt_uniform_compression && deb_format.major == 0) badusage(_("unsupported deb format '%d.%d' with non-uniform compression"), deb_format.major, deb_format.minor); @@ -308,6 +305,9 @@ int main(int argc, const char *const *argv) { if (deb_format.major == 0) compress_params = compress_params_deb0; + if (!compressor_check_params(&compress_params, &err)) + badusage(_("invalid compressor parameters: %s"), err.str); + if (opt_uniform_compression && (compress_params.type != COMPRESSOR_TYPE_NONE && compress_params.type != COMPRESSOR_TYPE_GZIP && |