[debhelper-devel] [debhelper] 01/03: Buildsystem: Fix a bug in _generic_doit_in_dir

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit 99fe288eefb5e6f8af0aeba546e0ef8cae759134
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Jan 6 19:38:09 2018 +0000

    Buildsystem: Fix a bug in _generic_doit_in_dir
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 lib/Debian/Debhelper/Buildsystem.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/Debian/Debhelper/Buildsystem.pm b/lib/Debian/Debhelper/Buildsystem.pm
index 7fcd3a3..a0ce636 100644
--- a/lib/Debian/Debhelper/Buildsystem.pm
+++ b/lib/Debian/Debhelper/Buildsystem.pm
@@ -317,7 +317,10 @@ sub _in_dir {
 
 sub _generic_doit_in_dir {
 	my ($this, $dir, $sub, @args) = @_;
-	my %args = ref($args[0]) ? %{$args[0]} : ();
+	my %args;
+	if (ref($args[0])) {
+		%args = %{shift(@args)};
+	}
 	$args{chdir} = $dir;
 	return $sub->(\%args, @args);
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git