- use pear list-upgrades info which prefers package preferred state

Changed files:
    pear-autoup.sh -> 1.4

diff --git a/pear-autoup.sh b/pear-autoup.sh
index d59f4030058fa8e9fb89dd660d912bf5758d983e..a75d8633d41d7add827ad696cb35c5f38d758c7c 100644 (file)
--- a/pear-autoup.sh
+++ b/pear-autoup.sh
@@ -9,16 +9,32 @@ set -e
 
 [ -f pear.ls ] || poldek -q --skip-installed --cmd 'ls php-pear-* | desc'
 [ -f pear.pkgs ] || awk '/^Source.package:/{print $3}' < pear.ls | sort -u | sed -re 's,-[^-]+-[^-]+.src.rpm$,,' > pear.pkgs
+[ -f pear.installed ] || { sudo poldek  --update --upa; sed -e 's,^,install ,' pear.pkgs | sudo poldek; touch pear.installed; }
+[ -f pear.upgrades ] || pear list-upgrades > pear.upgrades
 
 # filter out tests, see https://bugs.launchpad.net/poldek/+bug/620362
 sed -i -e '/-tests/d' pear.pkgs
 # more packages affected
 sed -i -e '/php-pear-Auth_Container_ADOdb/d' pear.pkgs
 sed -i -e '/php-pear-DB_DataObject-cli/d' pear.pkgs
+# not pear pkg
+sed -i -e '/^php-pear$/d' pear.pkgs
+
+# test that php is working
+php -r 'echo "ok\n";'
 
 for pkg in $(cat pear.pkgs); do
+       # check if there's update in channel
+       pearpkg=${pkg#php-pear-}
+       ver=$(awk -vpkg=$pearpkg '$2 == pkg {print $5}' pear.upgrades)
+       [ "$ver" ] || continue
+
+       # skip already processed packages
        [ -d $pkg ] && continue
-       ./builder -bb -u $pkg --define "_unpackaged_files_terminate_build 1" || {
+
+       # try upgrading with specified version
+       # pldnotify.awk uses "pear remote-info" which does not respect preferred package states
+       ./builder -bb -u $pkg --upgrade-version $ver --define "_unpackaged_files_terminate_build 1" || {
                cat >&2 <<-EOF
 
                $pkg failed
@@ -28,7 +44,7 @@ for pkg in $(cat pear.pkgs); do
        }
 
        # check for bad versions (which needs macros
-       ver=$(awk '/^Version:/{print $2; exit}' $pkg/$pkg.spec);
+       ver=$(awk '/^Version:/{print $2; exit}' $pkg/$pkg.spec)
        case "$ver" in
        *RC* | *a* | *b* | *alpha* | *beta* | *dev*)
                cat >&2 <<-EOF
@@ -40,5 +56,4 @@ for pkg in $(cat pear.pkgs); do
                exit 1
                ;;
        esac
-
 done