summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjosch <j.schauer@email.de>2014-12-16 08:24:59 +0100
committerHolger Levsen <holger@layer-acht.org>2014-12-16 12:49:36 +0100
commite4a29f3ee3f4a1cad9ac75862ecff713164f3f12 (patch)
tree8edb6d56dc4154193a2dd1e5c7b28d2d4f510f34
parent231acc059f76e930937cfa2104ac5e012ea833d0 (diff)
downloadjenkins.debian.net-e4a29f3ee3f4a1cad9ac75862ecff713164f3f12.tar.xz
use dpkg-deb /dev/stdin instead of arpy
-rwxr-xr-xextract_binary_control.py11
-rwxr-xr-xsetup.sh6
2 files changed, 3 insertions, 14 deletions
diff --git a/extract_binary_control.py b/extract_binary_control.py
deleted file mode 100755
index 1b498ba1..00000000
--- a/extract_binary_control.py
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env python3
-
-import arpy
-import sys
-
-ar=arpy.Archive(fileobj=sys.stdin.buffer)
-
-for f in ar:
- if f.header.name == b"control.tar.gz":
- sys.stdout.buffer.write(f.read())
- break
diff --git a/setup.sh b/setup.sh
index 5ac3b2c8..6981a813 100755
--- a/setup.sh
+++ b/setup.sh
@@ -72,9 +72,9 @@ curl "http://binarycontrol.debian.net/?q=&path=%2Ftriggers%24&format=pkglist" \
| while read pkg url; do
echo "working on $pkg..." >&2
mkdir DEBIAN
- curl --location --silent "$url" \
- | ./extract_binary_control.py \
- | tar -C "DEBIAN" --exclude=./md5sums -xz
+ curl --retry 2 --location --silent "$url" \
+ | dpkg-deb --ctrl-tarfile /dev/stdin \
+ | tar -C "DEBIAN" --exclude=./md5sums -x
if [ ! -f DEBIAN/triggers ]; then
rm -r DEBIAN
continue