summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-05-11 07:59:00 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2015-05-31 11:54:11 +0100
commit68fecefcb822012c8eaef19c4368a674111df509 (patch)
tree222cd0b8329309782cf99fdf3f6a63dece5d90c9
parent3eb14f7048c55754ee5ff6441623c0fe1ddd3641 (diff)
dgit-repos-policy-debian: Fix error handling, and test fixes
-rwxr-xr-xinfra/dgit-repos-policy-debian2
-rw-r--r--tests/lib9
2 files changed, 8 insertions, 3 deletions
diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index b631d07..ac42712 100755
--- 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 0e188cc..3428189 100644
--- 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;