Move many command-specific options to only be accepted by the command that uses them.

Affected options are: -x, -r, -R, -l, -L, -m, --include-conffiles,
--no-restart-on-upgrade, --no-start, --restart-after-upgrade,
--init-script, --filename, --flavor, --autodest, --libpackage, --add-udeb,
--dpkg-shlibdeps-params, --dpkg-gencontrol-params, --update-rcd-params,
--major, --remove-d, --dirs-only, --keep-debug, --version-info,
--list-missing, --fail-missing, --language, --until, --after, --before,
--remaining, --with

* If any third-party debhelper commands use any of the above options,
  they will be broken, and need to be changed to pass options to init().
* To avoid breaking rules files that pass options to commands that do not
  use them, debhelper will now only warn if it encounters an unknown
  option. This will be converted back to an error later.

1 files changed, 10 insertions, 1 deletions

diff --git a/dh b/dh
index 7c37d8d5..33308821 100755
--- a/dh
+++ b/dh
@@ -221,7 +221,16 @@ those in the sequence are still run.
 # Stash this away before init modifies it.
 my @ARGV_orig=@ARGV;
 
-init();
+init(options => {
+	"until=s" => \$dh{UNTIL},
+	"after=s" => \$dh{AFTER},
+	"before=s" => \$dh{BEFORE},
+	"remaining" => \$dh{REMAINING},
+	"with=s" => sub {
+		my ($option,$value)=@_;
+		push @{$dh{WITH}},$value;
+	},
+});
 inhibit_log();
 
 # Definitions of sequences.