summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjosch <j.schauer@email.de>2014-12-31 09:21:13 +0100
committerHolger Levsen <holger@layer-acht.org>2015-01-01 13:10:47 +0100
commitee78afcc7cacc802aaaa3cccd0f4023273f79d78 (patch)
treee30df83ed68692ba050f809383341dc4e9dbd655
parentca46167a16ce9d18ac203e233d98d373796c838a (diff)
downloadjenkins.debian.net-ee78afcc7cacc802aaaa3cccd0f4023273f79d78.tar.xz
find_dpkg_trigger_cycles: prepare for being run inside a jessie chroot
- drop python-arpy hack
-rwxr-xr-xbin/find_dpkg_trigger_cycles.sh4
1 files changed, 1 insertions, 3 deletions
diff --git a/bin/find_dpkg_trigger_cycles.sh b/bin/find_dpkg_trigger_cycles.sh
index a232f19e..eac4b2fa 100755
--- a/bin/find_dpkg_trigger_cycles.sh
+++ b/bin/find_dpkg_trigger_cycles.sh
@@ -156,10 +156,8 @@ curl "http://binarycontrol.debian.net/?q=&path=%2Ftriggers%24&format=pkglist" \
| while read pkg url; do
echo "working on $pkg..." >&2
tmpdir=`mktemp -d`
- # FIXME: please revert 9280f1c87 and following as soon as Jenkins run Jessie
- # this is about the next line:
curl --retry 2 --location --silent "$url" \
- | python -c 'exec("import arpy,sys,gzip,bz2,lzma,StringIO\nar=arpy.Archive(fileobj=sys.stdin)\nfor f in ar:\n\tif f.header.name == \"control.tar.gz\":\n\t\tsys.stdout.write(gzip.GzipFile(fileobj=StringIO.StringIO(f.read())).read())\n\t\tbreak\n\telif f.header.name == \"control.tar\":\n\t\tsys.stdout.write(f.read())\n\t\tbreak\n\telif f.header.name == \"control.tar.bz2\":\n\t\tsys.stdout.write(bz2.BZ2File(fileobj=StringIO.StringIO(f.read())).read())\n\t\tbreak\n\telif f.header.name == \"control.tar.xz\":\n\t\tsys.stdout.write(lzma.LZMAFile(fileobj=StringIO.StringIO(f.read())).read())\n\t\tbreak")' \
+ | dpkg-deb --ctrl-tarfile /dev/stdin \
| tar -C "$tmpdir" --exclude=./md5sums -x
if [ ! -f "$tmpdir/triggers" ]; then
rm -r "$tmpdir"