summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rwxr-xr-xdh3
2 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index db82503a..92327208 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ debhelper (12) UNRELEASED; urgency=medium
[ Niels Thykier ]
* Release debhelper/12 marking compat 12 as stable.
+ * dh: Special NOOP PROMISE of cli-options() to always allow skipping
+ the helper (as we know no option can make it change behaviour).
[ Dmitry Shachnev ]
* dh_compress: Do not compress mkdocs search indices
diff --git a/dh b/dh
index a1a4122b..e3d3c60e 100755
--- a/dh
+++ b/dh
@@ -1071,6 +1071,9 @@ sub can_skip {
return 0 if pkgfile($pkgs, $need) ne '';
} elsif ($type eq 'cli-options') {
$had_cli_options = 1;
+ # If cli-options is empty, we no the helper does not
+ # react to any thing and can always be skipped.
+ next if $need =~ m/^\s*$/;
# Long options are subject to abbreviations so it is
# very difficult to implement this optimization with
# long options.