dgit-repos-policy-debian: Fix error handling, and test fixes

diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index b631d07e8169a4ef65455f41530e77b1ea5f7623..ac427127464f4c932baa460a9e8ad170626d552f 100755 (executable)
--- a/infra/dgit-repos-policy-debian
+++ b/infra/dgit-repos-policy-debian
@@ -88,7 +88,7 @@ sub apiquery ($) {
     $cmd .= " archive-api-query $subpath";
     printdebug "apiquery $cmd\n";
     $!=0; $?=0; my $json = `$cmd`;
-    defined $json or die "$subpath $! $?";
+    defined $json && !$? or die "$subpath $! $?";
     my $r = decode_json $json;
     my $d = new Data::Dumper([$r], [qw(r)]);
     printdebug "apiquery $subpath | ", $d->Dump() if $debuglevel>=2;

diff --git a/tests/lib b/tests/lib
index 0e188cca4280e83cf1f3de309198901c226b8cf7..34281898f1def77f8b07cf730c2eea4dc444b1cc 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -101,12 +101,15 @@ t-prep-newpackage () {
 t-archive-none () {
        p=$1
        mkdir -p $tmp/aq $tmp/mirror/pool/main
-       mkdir -p $tmp/aq/dsc_in_suite $tmp/aq/dsc_in_suite/sid
 
        local suite=sid
+
        >$tmp/aq/package.$suite.$p
        t-archive-updated $suite $p
 
+       >$tmp/aq/package.new.$p
+       t-archive-updated new $p
+
        ln -s sid $tmp/aq/dsc_in_suite/unstable
        cat <<'END' >$tmp/aq/suites
 [
@@ -128,7 +131,9 @@ END
 t-archive-updated () {
        local suite=$1
        local p=$2
-       perl <$tmp/aq/package.$suite.$p >$tmp/aq/dsc_in_suite/$suite/$p -wne '
+       local suitedir=$tmp/aq/dsc_in_suite/$suite
+       mkdir -p $suitedir
+       perl <$tmp/aq/package.$suite.$p >$suitedir/$p -wne '
                use JSON;
                use strict;
                our @v;