Fix handling of -O with options specified by commands. Closes: #568081

diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm
index 214fa2dfbd3af2fe3b35e335af0daf734160f390..f5364870cf20afa4558c6aa1baa9fef4934f1c04 100644 (file)
--- a/Debian/Debhelper/Dh_Getopt.pm
+++ b/Debian/Debhelper/Dh_Getopt.pm
@@ -157,7 +157,9 @@ sub getoptions {
        foreach my $opt (@test) {
                # Try to parse an option, and skip it
                # if it is not known.
-               if (getoptions([$opt], test => 1)) {
+               if (getoptions([$opt], %params,
+                               ignore_unknown_options => 0,
+                               test => 1)) {
                        getoptions([$opt], %params);
                }
        }

diff --git a/debian/changelog b/debian/changelog
index 1a879f524c534074c57b0ad75f126977c38e0fa5..514301eae7bf2ae159e787266d460c66690b2998 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 debhelper (7.4.13) UNRELEASED; urgency=low
 
   * dh_compress: Avoid compressing images in /usr/share/info. Closes: #567586
+  * Fix handling of -O with options specified by commands. Closes: #568081
 
  -- Joey Hess <joeyh@debian.org>  Sun, 31 Jan 2010 14:34:30 -0500