r37459 - /trunk/dh-make-perl/lib/DhMakePerl/Config.pm
dmn at users.alioth.debian.org
dmn at users.alioth.debian.org
Fri Jun 5 12:37:11 UTC 2009
Author: dmn
Date: Fri Jun 5 12:37:07 2009
New Revision: 37459
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=37459
Log:
Config: fix config file parsing when same options are given on the command line
Modified:
trunk/dh-make-perl/lib/DhMakePerl/Config.pm
Modified: trunk/dh-make-perl/lib/DhMakePerl/Config.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl/Config.pm?rev=37459&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl/Config.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl/Config.pm Fri Jun 5 12:37:07 2009
@@ -184,12 +184,14 @@
( my $key = $_ ) =~ s/[!=|].*//;
next unless exists $yaml->{$key};
+
+ my $value = delete $yaml->{$key};
next
if $self->_explicitly_set
->{$key}; # cmd-line opts take precedence
( my $opt = $key ) =~ s/-/_/g;
- $self->$opt( delete $yaml->{$key} );
+ $self->$opt($value);
}
die "Error parsing $fn: the following keys are not known:\n"
More information about the Pkg-perl-cvs-commits
mailing list