Skip to content

Commit

Permalink
dh_*: Add cli-options NOOP PROMISES for most helpers
Browse files Browse the repository at this point in the history
Signed-off-by: Niels Thykier <niels@thykier.net>
  • Loading branch information
nthykier committed Sep 14, 2018
1 parent 329b38c commit 3e869c1
Show file tree
Hide file tree
Showing 35 changed files with 35 additions and 36 deletions.
2 changes: 1 addition & 1 deletion dh_auto_build
Expand Up @@ -45,7 +45,7 @@ B<dh_auto_build> usually passes.
=cut

# PROMISE: DH NOOP WITHOUT buildsystem(build)
# PROMISE: DH NOOP WITHOUT cli-options(BUILDSYSTEM) buildsystem(build)

buildsystems_init();
buildsystems_do();
Expand Down
2 changes: 1 addition & 1 deletion dh_auto_clean
Expand Up @@ -46,7 +46,7 @@ B<dh_auto_clean> usually passes.
=cut

# PROMISE: DH NOOP WITHOUT buildsystem(clean)
# PROMISE: DH NOOP WITHOUT cli-options(BUILDSYSTEM) buildsystem(clean)

inhibit_log();
buildsystems_init();
Expand Down
2 changes: 1 addition & 1 deletion dh_auto_configure
Expand Up @@ -50,7 +50,7 @@ B<dh_auto_configure> usually passes. For example:
=cut

# PROMISE: DH NOOP WITHOUT buildsystem(configure)
# PROMISE: DH NOOP WITHOUT cli-options(BUILDSYSTEM) buildsystem(configure)

buildsystems_init();
buildsystems_do();
Expand Down
2 changes: 1 addition & 1 deletion dh_auto_install
Expand Up @@ -71,7 +71,7 @@ buildsystems_init(options => {
"destdir=s" => \$destdir,
});

# PROMISE: DH NOOP WITHOUT buildsystem(install)
# PROMISE: DH NOOP WITHOUT cli-options(BUILDSYSTEM) buildsystem(install)

# If destdir is not specified, determine it automatically
if (!$destdir) {
Expand Down
2 changes: 1 addition & 1 deletion dh_auto_test
Expand Up @@ -52,7 +52,7 @@ tests will be performed.
=cut

# PROMISE: DH NOOP WITHOUT buildsystem(test)
# PROMISE: DH NOOP WITHOUT cli-options(BUILDSYSTEM) buildsystem(test)

if (get_buildoption("nocheck")) {
exit 0;
Expand Down
2 changes: 1 addition & 1 deletion dh_bugfiles
Expand Up @@ -74,7 +74,7 @@ my %bugfile_types = (
"control" => "bug-control",
"presubj" => "bug-presubj",
);
# PROMISE: DH NOOP WITHOUT bug-script bug-control bug-presubj
# PROMISE: DH NOOP WITHOUT bug-script bug-control bug-presubj cli-options()

foreach my $package (@{$dh{DOPACKAGES}}) {
next if is_udeb($package);
Expand Down
2 changes: 1 addition & 1 deletion dh_gconf
Expand Up @@ -63,7 +63,7 @@ if (defined $dh{PRIORITY}) {
$priority=$dh{PRIORITY};
}

# PROMISE: DH NOOP WITHOUT gconf-mandatory gconf-defaults tmp(etc/gconf/schemas) tmp(usr/share/gconf/schemas)
# PROMISE: DH NOOP WITHOUT gconf-mandatory gconf-defaults tmp(etc/gconf/schemas) tmp(usr/share/gconf/schemas) cli-options()

foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp=tmpdir($package);
Expand Down
2 changes: 1 addition & 1 deletion dh_icons
Expand Up @@ -44,7 +44,7 @@ Do not modify maintainer scripts.

init();

# PROMISE: DH NOOP WITHOUT tmp(usr/share/icons)
# PROMISE: DH NOOP WITHOUT tmp(usr/share/icons) cli-options()
my $baseicondir="/usr/share/icons";

foreach my $package (@{$dh{DOPACKAGES}}) {
Expand Down
2 changes: 1 addition & 1 deletion dh_install
Expand Up @@ -138,7 +138,7 @@ if ($dh{EXCLUDE_FIND}) {
$exclude = '! \( '.$dh{EXCLUDE_FIND}.' \)';
}

# PROMISE: DH NOOP WITHOUT pkgfile-logged(install)
# PROMISE: DH NOOP WITHOUT pkgfile-logged(install) cli-options()

foreach my $package (getpackages()) {
my (@installed, %dest2sources);
Expand Down
2 changes: 1 addition & 1 deletion dh_installcatalogs
Expand Up @@ -71,7 +71,7 @@ multiple instances of the same text to be added to maintainer scripts.

init();

# PROMISE: DH NOOP WITHOUT sgmlcatalogs
# PROMISE: DH NOOP WITHOUT sgmlcatalogs cli-options()

foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmpdir = tmpdir($package);
Expand Down
2 changes: 1 addition & 1 deletion dh_installcron
Expand Up @@ -56,7 +56,7 @@ as the package name.

init();

# PROMISE: DH NOOP WITHOUT cron.hourly cron.daily cron.weekly cron.monthly cron.d
# PROMISE: DH NOOP WITHOUT cron.hourly cron.daily cron.weekly cron.monthly cron.d cli-options()

foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp=tmpdir($package);
Expand Down
2 changes: 1 addition & 1 deletion dh_installdebconf
Expand Up @@ -84,7 +84,7 @@ if (defined($dh{U_PARAMS})) {
@extraparams=@{$dh{U_PARAMS}};
}

# PROMISE: DH NOOP WITHOUT config templates
# PROMISE: DH NOOP WITHOUT config templates cli-options()

foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp=tmpdir($package);
Expand Down
2 changes: 1 addition & 1 deletion dh_installdirs
Expand Up @@ -81,7 +81,7 @@ init(options => {
'create-in-sourcedir!' => \$create_in_sourcedir,
});

# PROMISE: DH NOOP WITHOUT dirs
# PROMISE: DH NOOP WITHOUT dirs cli-options()

foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp=tmpdir($package);
Expand Down
2 changes: 1 addition & 1 deletion dh_installemacsen
Expand Up @@ -92,7 +92,7 @@ if (! defined $dh{FLAVOR}) {
$dh{FLAVOR}='emacs';
}

# PROMISE: DH NOOP WITHOUT emacsen-common emacsen-install emacsen-remove emacsen-startup
# PROMISE: DH NOOP WITHOUT emacsen-common emacsen-install emacsen-remove emacsen-startup cli-options()

foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp=tmpdir($package);
Expand Down
2 changes: 1 addition & 1 deletion dh_installexamples
Expand Up @@ -99,7 +99,7 @@ init(options => {
'doc-main-package=s' => \$dh{DOC_MAIN_PACKAGE},
});

# PROMISE: DH NOOP WITHOUT pkgfile-logged(examples)
# PROMISE: DH NOOP WITHOUT pkgfile-logged(examples) cli-options()

my $pwd;
my $default_error_handler = compat(10) ? \&glob_expand_error_handler_reject_nomagic_warn_discard : \&glob_expand_error_handler_reject;
Expand Down
2 changes: 1 addition & 1 deletion dh_installgsettings
Expand Up @@ -64,7 +64,7 @@ if (defined $dh{PRIORITY}) {
$priority=$dh{PRIORITY};
}

# PROMISE: DH NOOP WITHOUT gsettings-override tmp(usr/share/glib-2.0/schemas)
# PROMISE: DH NOOP WITHOUT gsettings-override tmp(usr/share/glib-2.0/schemas) cli-options()

foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp=tmpdir($package);
Expand Down
2 changes: 1 addition & 1 deletion dh_installifupdown
Expand Up @@ -55,7 +55,7 @@ as the package name.

init();

# PROMISE: DH NOOP WITHOUT if-pre-up if-up if-down if-post-down
# PROMISE: DH NOOP WITHOUT if-pre-up if-up if-down if-post-down cli-options()

foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp=tmpdir($package);
Expand Down
2 changes: 1 addition & 1 deletion dh_installinfo
Expand Up @@ -67,7 +67,7 @@ init(options => {
"sourcedir=s" => \$dh{SOURCEDIR},
});

# PROMISE: DH NOOP WITHOUT info
# PROMISE: DH NOOP WITHOUT info cli-options()

my $default_error_handler = compat(10) ? \&glob_expand_error_handler_reject_nomagic_warn_discard : \&glob_expand_error_handler_reject;
my $nodocs = is_build_profile_active('nodoc') || get_buildoption('nodoc') ? 1 : 0;
Expand Down
2 changes: 1 addition & 1 deletion dh_installinit
Expand Up @@ -228,7 +228,7 @@ init(options => {
"no-enable" => \$dh{NO_ENABLE},
});

# PROMISE: DH NOOP WITHOUT service tmpfile default upstart init init.d tmp(usr/lib/tmpfiles.d) tmp(etc/tmpfiles.d)
# PROMISE: DH NOOP WITHOUT service tmpfile default upstart init init.d tmp(usr/lib/tmpfiles.d) tmp(etc/tmpfiles.d) cli-options(--init-script|-d|--remove-d|-o|--only-scripts)

my %snippet_options = ('snippet-order' => 'service');

Expand Down
3 changes: 1 addition & 2 deletions dh_installinitramfs
Expand Up @@ -60,7 +60,7 @@ instances of the same text to be added to maintainer scripts.

init();

# PROMISE: DH NOOP WITHOUT initramfs-hook tmp(usr/share/initramfs-tools/hooks)
# PROMISE: DH NOOP WITHOUT initramfs-hook tmp(usr/share/initramfs-tools/hooks) cli-options()

foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp = tmpdir($package);
Expand All @@ -74,7 +74,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
$has_hooks = 1;
} elsif (-d $hook_dir and not is_empty_dir($hook_dir)) {
$has_hooks = 1;

}

if ($has_hooks && ! $dh{NOSCRIPTS}) {
Expand Down
2 changes: 1 addition & 1 deletion dh_installlogcheck
Expand Up @@ -58,7 +58,7 @@ use the specified name instead of that of the package.

init();

# PROMISE: DH NOOP WITHOUT logcheck.cracking logcheck.violations logcheck.violations.ignore logcheck.ignore.workstation logcheck.ignore.server logcheck.ignore.paranoid
# PROMISE: DH NOOP WITHOUT logcheck.cracking logcheck.violations logcheck.violations.ignore logcheck.ignore.workstation logcheck.ignore.server logcheck.ignore.paranoid cli-options()

foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp=tmpdir($package);
Expand Down
2 changes: 1 addition & 1 deletion dh_installlogrotate
Expand Up @@ -38,7 +38,7 @@ as the package name.

init();

# PROMISE: DH NOOP WITHOUT logrotate
# PROMISE: DH NOOP WITHOUT logrotate cli-options()

foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp=tmpdir($package);
Expand Down
2 changes: 1 addition & 1 deletion dh_installman
Expand Up @@ -140,7 +140,7 @@ init(options => {
});


# PROMISE: DH NOOP WITHOUT pkgfile-logged(manpages) tmp(usr/share/man)
# PROMISE: DH NOOP WITHOUT pkgfile-logged(manpages) tmp(usr/share/man) cli-options()

my (@sofiles, @sodests);
my @all_packages = getpackages();
Expand Down
2 changes: 1 addition & 1 deletion dh_installmenu
Expand Up @@ -55,7 +55,7 @@ Do not modify F<postinst>/F<postrm> scripts.

init();

# PROMISE: DH NOOP WITHOUT menu menu-method
# PROMISE: DH NOOP WITHOUT menu menu-method cli-options()

foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp=tmpdir($package);
Expand Down
2 changes: 1 addition & 1 deletion dh_installmime
Expand Up @@ -41,7 +41,7 @@ directory.

init();

# PROMISE: DH NOOP WITHOUT mime sharedmimeinfo
# PROMISE: DH NOOP WITHOUT mime sharedmimeinfo cli-options()

foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp=tmpdir($package);
Expand Down
2 changes: 1 addition & 1 deletion dh_installmodules
Expand Up @@ -86,7 +86,7 @@ sub find_kernel_modules {
return sort(keys(%versions));
}

# PROMISE: DH NOOP WITHOUT modprobe tmp(lib/modules)
# PROMISE: DH NOOP WITHOUT modprobe tmp(lib/modules) cli-options()

foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp=tmpdir($package);
Expand Down
2 changes: 1 addition & 1 deletion dh_installpam
Expand Up @@ -47,7 +47,7 @@ using the package name.

init();

# PROMISE: DH NOOP WITHOUT pam
# PROMISE: DH NOOP WITHOUT pam cli-options()

foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp=tmpdir($package);
Expand Down
2 changes: 1 addition & 1 deletion dh_installppp
Expand Up @@ -51,7 +51,7 @@ as the package name.

init();

# PROMISE: DH NOOP WITHOUT ppp.ip-up ppp.ip-down
# PROMISE: DH NOOP WITHOUT ppp.ip-up ppp.ip-down cli-options()

foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp=tmpdir($package);
Expand Down
2 changes: 1 addition & 1 deletion dh_installsystemd
Expand Up @@ -238,7 +238,7 @@ sub list_installed_units {
}


# PROMISE: DH NOOP WITHOUT tmp(lib/systemd/system) tmp(usr/lib/tmpfiles.d) tmp(etc/tmpfiles.d) mount path service socket target tmpfile timer
# PROMISE: DH NOOP WITHOUT tmp(lib/systemd/system) tmp(usr/lib/tmpfiles.d) tmp(etc/tmpfiles.d) mount path service socket target tmpfile timer cli-options()


# Install package maintainer supplied unit files
Expand Down
2 changes: 1 addition & 1 deletion dh_installudev
Expand Up @@ -78,7 +78,7 @@ if ($dh{PRIORITY}) {
$old_priority.="_";
}

# PROMISE: DH NOOP WITHOUT udev
# PROMISE: DH NOOP WITHOUT udev cli-options()

foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp=tmpdir($package);
Expand Down
2 changes: 1 addition & 1 deletion dh_installwm
Expand Up @@ -86,7 +86,7 @@ if (@ARGV) {

my $nodocs = is_build_profile_active('nodoc') || get_buildoption('nodoc') ? 1 : 0;

# PROMISE: DH NOOP WITHOUT wm
# PROMISE: DH NOOP WITHOUT wm cli-options()

foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp=tmpdir($package);
Expand Down
2 changes: 1 addition & 1 deletion dh_installxfonts
Expand Up @@ -49,7 +49,7 @@ way.

init();

# PROMISE: DH NOOP WITHOUT tmp(usr/share/fonts/X11)
# PROMISE: DH NOOP WITHOUT tmp(usr/share/fonts/X11) cli-options()

foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp=tmpdir($package);
Expand Down
2 changes: 1 addition & 1 deletion dh_lintian
Expand Up @@ -42,7 +42,7 @@ overrides for the source package.

init();

# PROMISE: DH NOOP WITHOUT lintian-overrides
# PROMISE: DH NOOP WITHOUT lintian-overrides cli-options()

foreach my $package (@{$dh{DOPACKAGES}}) {
next if is_udeb($package);
Expand Down
2 changes: 1 addition & 1 deletion dh_ucf
Expand Up @@ -67,7 +67,7 @@ instances of the same text to be added to maintainer scripts.

init();

# PROMISE: DH NOOP WITHOUT ucf
# PROMISE: DH NOOP WITHOUT ucf cli-options()

foreach my $package (@{$dh{DOPACKAGES}}) {
my $file=pkgfile($package,"ucf");
Expand Down
2 changes: 1 addition & 1 deletion dh_usrlocal
Expand Up @@ -71,7 +71,7 @@ Debian policy, version 2.2

init();

# PROMISE: DH NOOP WITHOUT tmp(usr/local)
# PROMISE: DH NOOP WITHOUT tmp(usr/local) cli-options()

foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp = tmpdir($package);
Expand Down

0 comments on commit 3e869c1

Please sign in to comment.