[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] Revert "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:
2b758ac0 by Holger Levsen at 2019-01-09T23:16:19Z
Revert "Revert "reproducible: Support arbitrary package filters when generating deb822 output.""

This reverts commit b5bb8c4f2c7c02ff64025ac47202a4d47327c58c.

- - - - -


1 changed file:

- bin/reproducible_create_meta_pkg_sets.sh


Changes:

=====================================
bin/reproducible_create_meta_pkg_sets.sh
=====================================
@@ -21,8 +21,21 @@ ABORT=false
 
 # helper functions
 packages_list_to_deb822() {
-	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
+	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
 }
 
 tails_build_manifest_to_deb822() {



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/2b758ac01a91483009ac68564357568181737d6a
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/662644d8/attachment-0001.html>