summaryrefslogtreecommitdiff
path: root/Debian/Debhelper/Dh_Lib.pm
diff options
context:
space:
mode:
authorModestas Vainius <modestas@vainius.eu>2009-06-13 17:25:31 +0300
committerModestas Vainius <modestas@vainius.eu>2009-06-13 17:30:57 +0300
commit62935f37b81b97baa72efd77a9e913756a60ac2c (patch)
tree99fc241bb40736571cd0bac79619a185e567da23 /Debian/Debhelper/Dh_Lib.pm
parent9be81947e83e65726f2f34311276a153b5178a18 (diff)
Revert "Improvements in DH_OPTIONS handling and DH_AUTO_OPTIONS envvar support."
This mostly reverts commit f897611a77726655aea258af0c4d52a8ce759ebc. Remaining cosmetic changes (all functional changes have been reverted): * Refactoring of option string into split_options_string() sub (no semantic changes though). * Cosmetic change in Dh_Buildsystems.pm. Breaks testsuite.
Diffstat (limited to 'Debian/Debhelper/Dh_Lib.pm')
-rw-r--r--Debian/Debhelper/Dh_Lib.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index b3162d0..28a90f7 100644
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -29,10 +29,10 @@ sub init {
# Getopt::Long, which I'd prefer to avoid loading at all if possible.
if ((defined $ENV{DH_OPTIONS} && length $ENV{DH_OPTIONS}) ||
(defined $ENV{DH_INTERNAL_OPTIONS} && length $ENV{DH_INTERNAL_OPTIONS}) ||
- (defined $params{extra_args}) || grep /^-/, @ARGV) {
+ grep /^-/, @ARGV) {
eval "use Debian::Debhelper::Dh_Getopt";
error($@) if $@;
- Debian::Debhelper::Dh_Getopt::parseopts($params{options}, $params{extra_args});
+ Debian::Debhelper::Dh_Getopt::parseopts($params{options});
}
# Another way to set excludes.