- depend on fixed poldek src info

- workaround another poldek sillyness

Changed files:
    pear-autoup.sh -> 1.14

diff --git a/pear-autoup.sh b/pear-autoup.sh
index 966fc2310af0ba88b4a95719927f7fd73a0f7439..bffb0ab0bcc6fabc832fcdfc1a1da557c508359a 100644 (file)
--- a/pear-autoup.sh
+++ b/pear-autoup.sh
@@ -16,12 +16,7 @@ pear info PEAR >/dev/null
 # 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 @@ rpm -q php-packagexml2cl php-pear-PEAR_Command_Packaging
 
 [ -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