packages: pear-autoup.sh - depend on fixed poldek src info - workaround ano...

[glen]

Author: glen                         Date: Tue Nov 16 14:34:09 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- depend on fixed poldek src info
- workaround another poldek sillyness

---- Files affected:
packages:
   pear-autoup.sh (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: packages/pear-autoup.sh
diff -u packages/pear-autoup.sh:1.13 packages/pear-autoup.sh:1.14
--- packages/pear-autoup.sh:1.13	Tue Nov 16 09:50:27 2010
+++ packages/pear-autoup.sh	Tue Nov 16 15:34:04 2010
@@ -16,12 +16,7 @@
 # needed pkgs for upgrade test
 rpm -q php-packagexml2cl php-pear-PEAR_Command_Packaging
 
-[ -s pear.ls ] || { poldek --upa; poldek -q -Q --skip-installed --cmd 'ls php-pear-*' > pear.ls; }
-[ -s pear.desc ] || {
-	for pkg in $(cat pear.ls); do
-		poldek -q --skip-installed --cmd "desc $pkg"
-	done
-} > pear.desc
+[ -s pear.desc ] || { poldek --upa; poldek -q -Q --skip-installed --cmd 'desc php-pear-*' > pear.desc; }
 [ -s pear.pkgs ] || {
 	awk '/^Source.package:/{print $3}' < pear.desc | sed -re 's,-[^-]+-[^-]+.src.rpm$,,' | sort -u > pear.pkgs
 
@@ -36,7 +31,13 @@
 
 [ -f pear.installed ] || {
 	sudo poldek  --update --upa
+	# as sudo & poldek don't allow us to capture (no pipe or redirection work),
+	# we create markers which we could grab when invoked via "script"
+	echo "BEGIN INSTALL PACKAGES"
 	sed -e 's,^,install ,' pear.pkgs | sudo poldek
+	echo "END INSTALL PACKAGES"
+	# rm -f pear.installed && script -c ./pear-autoup.sh pear.install.log
+	# sed -ne '/BEGIN INSTALL PACKAGES/,/END INSTALL PACKAGES/p' pear.install.log | grep -vE 'poldek:/.*install|: ambiguous name|equal version installed, skipped|Nothing to do' | less
 	touch pear.installed
 }
 [ -s pear.upgrades ] || pear list-upgrades > pear.upgrades
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pear-autoup.sh?r1=1.13&r2=1.14&f=u