From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 22 Jan 2014 18:29:09 +0000 (+0000)
Subject: dgit-repos-server: fixes from testing
X-Git-Tag: debian/0.22~91
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=6028a357a7c95c38d6d48c566463641583431978

dgit-repos-server: fixes from testing
---

diff --git a/dgit-repos-server b/dgit-repos-server
index 2a0bf40e..7c48b2f3 100755
--- a/dgit-repos-server
+++ b/dgit-repos-server
@@ -105,7 +105,7 @@ sub acquirelock ($$) {
     my $fh;
     for (;;) {
 	close $fh if $fh;
-	$fh = new IO::File ">", $lock or die "open $lock: $!";
+	$fh = new IO::File $lock, ">" or die "open $lock: $!";
 	my $ok = flock $fh, $must ? LOCK_EX : (LOCK_EX|LOCK_NB);
 	if (!$ok) {
 	    return undef unless $must;
diff --git a/tests/drs-git-ext b/tests/drs-git-ext
index f7837056..27b2ea3b 100755
--- a/tests/drs-git-ext
+++ b/tests/drs-git-ext
@@ -9,6 +9,6 @@ export SSH_ORIGINAL_COMMAND="$*"
 ${DGIT_REPOS_SERVER_TEST-dgit-repos-server} \
 	$tmp/suites \
 	$tmp/dd.gpg,a:$tmp/dm.gpg,m$tmp/dm.txt \
-	$troot/git \
+	$tmp/git \
 	--ssh
 : '))))))))))))))))))))))))))))))))))))))))'