[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] Revert "reproducible: Support arbitrary package filters when generating deb822 output."

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
b5bb8c4f by Holger Levsen at 2019-01-09T15:56:39Z
Revert "reproducible: Support arbitrary package filters when generating deb822 output."

This reverts commit 607abf0b312d68d8775f20ecda928af6aaee0dcf.

- - - - -


1 changed file:

- bin/reproducible_create_meta_pkg_sets.sh


Changes:

=====================================
bin/reproducible_create_meta_pkg_sets.sh
=====================================
@@ -21,21 +21,8 @@ ABORT=false
 
 # helper functions
 packages_list_to_deb822() {
-	script=$(cat <<'EOF'
-		use Dpkg::Control;
-		my $fd;
-		open($fd, '<', $ARGV[0]) or die $!;
-		my %packages = map { chomp; $_ => 1 } <STDIN>;
-		while (1) {
-			my $deb822 = Dpkg::Control->new();
-			last unless $deb822->parse($fd);
-			print "$deb822\n" if $packages{$deb822->{'Package'}};
-		}
-		close($fd);
-EOF
-	)
-	perl -e "$script" $PACKAGES < $TMPFILE > $TMPFILE2
-	mv $TMPFILE2 $TMPFILE
+	ALL_PKGS=$(cat $TMPFILE | cut -d ":" -f1 | sed "s#([^()]*)##g ; s#\[[^][]*\]##g ; s#,##g ; s# #\n#g"  |sort -u | tr '\n' '|')
+	grep-dctrl -F Package -e '^('"$ALL_PKGS"')$' $PACKAGES > $TMPFILE
 }
 
 tails_build_manifest_to_deb822() {



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/b5bb8c4f2c7c02ff64025ac47202a4d47327c58c

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/b5bb8c4f2c7c02ff64025ac47202a4d47327c58c
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20190109/3088c7fa/attachment-0001.html>