grep /^-/, @ARGV) {
eval "use Debian::Debhelper::Dh_Getopt";
error($@) if $@;
- Debian::Debhelper::Dh_Getopt::parseopts($params{options});
+ Debian::Debhelper::Dh_Getopt::parseopts(%params);
}
# Another way to set excludes.
}
}
-# Output an error message and exit.
+# Output an error message and die (can be caught).
sub error {
my $message=shift;
- warning($message);
- exit 1;
+ die basename($0).": $message\n";
}
# Output a warning.
}
}
- if ($c < 4 && ! $warned_compat) {
+ if ($c <= 4 && ! $warned_compat) {
warning("Compatibility levels before 5 are deprecated.");
$warned_compat=1;
}
# as if we were in the specified directory, so the
# filenames that come out are relative to it.
if (defined $globdir && ! compat(2)) {
- for (map { glob "$globdir/$_" } split) {
+ foreach (map { glob "$globdir/$_" } split) {
s#^$globdir/##;
push @line, $_;
}