From 584c38c46b765addf8b20080b7cfa4073f64dfd0 Mon Sep 17 00:00:00 2001
From: Wulf Krueger <philantrop@gentoo.org>
Date: Sat, 8 Dec 2007 13:16:09 +0000
Subject: Added a patch by zlin to correct the useless use of cat.

svn path=/trunk/; revision=55
---
 scripts/qa.sh | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/scripts/qa.sh b/scripts/qa.sh
index 84e048d..affa0bd 100755
--- a/scripts/qa.sh
+++ b/scripts/qa.sh
@@ -60,11 +60,15 @@ pushd . >/dev/null
 # Delete the Manifest to avoid double-signing
 rm -f Manifest 
 
+# Delete digests to avoid leaving stray digest files behind when dropping old 
+# ebuilds.
+rm -f files/digest-*
+
 # Fetch all files
 for x in $(find . -type f -name "*.ebuild"); do
 	echo "Fetching distfiles for $x..."
 	USE=$(grep -h "IUSE=" *.ebuild | cut -d "=" -f 2 | tr ' ' '\n' | sed "s/[\n\"]//g" | sed "s/\+//g" | sort -u | tr '\n' ' ')
-	export USE="${USE} $(cat ${GENTOO_PORTAGE_TREE}/profiles/desc/linguas.desc | grep -v '^#' | cut -d ' ' -f1 | sed '/./,$!d' | sed -e 's:^:linguas_:' | sort -u | tr '\n' ' ')"
+	export USE="${USE} $(grep -v '^#' < ${GENTOO_PORTAGE_TREE}/profiles/desc/linguas.desc | cut -d ' ' -f1 | sed '/./,$!d' | sed -e 's:^:linguas_:' | sort -u | tr '\n' ' ')"
 	RESTRICT="mirror" ebuild $x fetch >/dev/null 2>&1
 	# Make sure we *really* got all :-)
 	RESTRICT="mirror" emerge --nodeps --fetch-all-uri $x >/dev/null 2>&1
@@ -74,15 +78,20 @@ unset USE
 
 # Show the KEYWORDS matrix
 echo 
-adjutrix -k --log-level silent
+# adjutrix -k --log-level silent
+if [[ ${2: -10} = ${GENTOO_PORTAGE_TREE: -10} ]] ; then
+	adjutrix -k --log-level warning
+elif [[ $2 != ${GENTOO_PORTAGE_TREE} ]] ; then
+	adjutrix -k --log-level warning --master-repository-dir ${GENTOO_PORTAGE_TREE}
+fi
+echo
 
-# I wanted use reprehendo but it requires >=paludis-0.25.0 or paludis-scm and the latter sucks
+# I wanted use reprehendo but it requires >=paludis-0.25.0 or paludis-scm.
 # reprehendo --sign --key-id ${GPG_KEY}
 
 # Sign the manifest
-cat "${GPG_DIR}/${GPG_PASSWD_FILE}" | gpg -q --batch --passphrase-fd 0 --sign --clearsign --yes --default-key ${GPG_KEY} --homedir ${GPG_DIR} Manifest >/dev/null 2>&1
-cp Manifest.asc Manifest
-rm -f Manifest.asc
+gpg -q --batch --passphrase-fd 0 --sign --clearsign --yes --default-key ${GPG_KEY} --homedir ${GPG_DIR} Manifest < "${GPG_DIR}/${GPG_PASSWD_FILE}" >/dev/null 2>&1 
+mv Manifest.asc Manifest
 
 # See what Qualudis has to say about it...
 #QA_DIR=$(pwd | sed -e "s:$2/::")
-- 
cgit v1.2.3-65-gdbad