From 85a9e847926d6b85d76551f5f17bcb4f6f3febcd Mon Sep 17 00:00:00 2001
From: Elan Ruusamäe
Date: Mon, 6 Aug 2012 15:35:11 +0000
Subject: seems this way of invoking poldek does not need tty hacks at all, but
 bug still relevant

Changed files:
    wwwbin/consistency-check.sh -> 1.6
diff --git a/wwwbin/consistency-check.sh b/wwwbin/consistency-check.sh
index 713cf1e..5a18cb6 100644
--- a/wwwbin/consistency-check.sh
+++ b/wwwbin/consistency-check.sh
@@ -20,9 +20,6 @@ group_deps() {
 
 # convert pkg name to src.rpm name
 # uses poldek
-# TODO: simplify when these bugs get a solution:
-# https://bugs.launchpad.net/poldek/+bug/1031762
-# https://bugs.launchpad.net/poldek/+bug/1031767
 pkg2src() {
 	local t=$(mktemp)
 	local t1=$(mktemp)
@@ -32,21 +29,18 @@ pkg2src() {
 	# save input
 	cat > $t
 
+	# create list of packages from error report
 	# error: arcconf-7.0.18786-1: req libstdc++.so.5()(64bit) not found
-	# need to include arch as '*', due this bug: https://bugs.launchpad.net/poldek/+bug/1031762
-	sed -ne 's/error: \(.*\): req .* not found/\1\.\*/p' $t | sort -u > $t1
+	sed -ne 's/error: \(.*\): req .* not found/\1/p' $t | sort -u > $t1
 
-	# poldek:/all-avail> ls -s arcconf-7.0.18786-1.*
-	# arcconf-7.0.18786-1.x86_64     arcconf-7.0.18786-1.src.rpm
-	#poldek --cmd < $t > $t2
-	# poldek is an ass, it doesn't allow stdout to be redirected: "error: not a tty"
-	# hack around with xargs submitting input to 'ls' command
-	# https://bugs.launchpad.net/poldek/+bug/1031767
-	xargs --delimiter='\n' --arg-file=$t1 -- /usr/bin/poldek --noignore -Q "$@" --cmd ls -q -s >$t2
+	# create list of package -> src.rpm names
+	poldek --noignore -Q "$@" --cmd ls -q -s > $t2
 
 	# create N-V-R -> N list
 	local pkg error message srpm
 	while read pkg; do
+		# there's no space between the columns, so need to match with known archs
+		# see https://bugs.launchpad.net/poldek/+bug/1031767
 		sed -rne "s/^($pkg)\.(x86_64|i686|noarch)(.+)-[^-]+-[^-]+\.src\.rpm$/\1\t\3/p" $t2
 	done < $t1 > $t3
 
-- 
cgit v0.10.2