summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2014-02-12 18:25:31 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2014-03-05 18:29:06 +0000
commitb19d59fb104f8f260a139c838fc08a0158431415 (patch)
treeff03c3b7120cbba6e247627c993a2043f1955eae
parent573113227f3c802e15b46aafc15dc65c5fe2ecba (diff)
dgit-repos-server: fixes, tests. can now pass drs-clone-nogit, really
-rwxr-xr-xdgit-repos-server9
-rw-r--r--tests/lib1
2 files changed, 9 insertions, 1 deletions
diff --git a/dgit-repos-server b/dgit-repos-server
index 57cb5be..ad4cde5 100755
--- a/dgit-repos-server
+++ b/dgit-repos-server
@@ -451,6 +451,14 @@ sub checksuite () {
reject "unknown suite";
}
+sub tagh1 ($) {
+ my ($tag) = @_;
+ my $vals = $tagh{$tag};
+ reject "missing tag $tag in signed tag object" unless $vals;
+ reject "multiple tags $tag in signed tag object" unless @$vals == 1;
+ return $vals->[0];
+}
+
sub checks () {
debug "checks";
checksuite();
@@ -485,7 +493,6 @@ sub onwardpush () {
sub stunthook () {
debug "stunthook";
- print Dumper(\$ENV{GIT_DIR});
chdir $workrepo or die "chdir $workrepo: $!";
mkdir "dgit-tmp" or $!==EEXIST or die $!;
readupdates();
diff --git a/tests/lib b/tests/lib
index 7c82081..0630f1d 100644
--- a/tests/lib
+++ b/tests/lib
@@ -238,5 +238,6 @@ t-drs-test () {
export DGIT_TEST_TESTNAME="$testname"
export ADTTMP=$tmp
cp $root/tests/gnupg/{dd.gpg,dm.gpg,dm.txt} $tmp/.
+ cp $root/tests/suites $tmp/.
exec "${0///drs-//}" "$@"
}