autoport: - fix error detecting pkg_milestone introduced with previous optimizations

- don't list up to date packages in batch mode unless -v (verbose) is specified
This commit is contained in:
Silvan Calarco 2012-05-15 16:28:01 +02:00
parent c624adf788
commit ba9a55182e
2 changed files with 4 additions and 4 deletions

View File

@ -5,7 +5,7 @@
# #
# Released under the terms of the GNU GPL release 3 license # Released under the terms of the GNU GPL release 3 license
# #
VERSION=0.9.1 VERSION=0.9.2
me=(${0##*/} $VERSION "Sat Aug 20 2010") me=(${0##*/} $VERSION "Sat Aug 20 2010")
exec 3>`readlink /proc/self/fd/0` exec 3>`readlink /proc/self/fd/0`

View File

@ -4,7 +4,7 @@
# #
# Released under the terms of the GNU GPL release 3 license # Released under the terms of the GNU GPL release 3 license
# #
VERSION=0.9.1 VERSION=0.9.2
BASE_ARCH=i586 BASE_ARCH=i586
BASE_REPOSITORY=devel BASE_REPOSITORY=devel
PORT_REPOSITORY=devel PORT_REPOSITORY=devel
@ -300,7 +300,7 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
port_pkg_rel=$pkg_release port_pkg_rel=$pkg_release
if [ "$target_pkg_name" ]; then if [ "$target_pkg_name" ]; then
pkg_milestone=`echo $target_pkg_release | sed "s|[0-9.]*\(.*\)|\1|"` pkg_milestone=`echo $target_pkg_rel | sed "s|[0-9.]*\(.*\)|\1|"`
if [ "$target_pkg_ver" != "$port_pkg_ver" ]; then if [ "$target_pkg_ver" != "$port_pkg_ver" ]; then
echo "Package $pkg_name#${port_pkg_ver}-${port_pkg_rel}($TARGET_ARCH) differs from $pkg_name#${target_pkg_ver}-${target_pkg_rel}($BASE_ARCH); port needed." echo "Package $pkg_name#${port_pkg_ver}-${port_pkg_rel}($TARGET_ARCH) differs from $pkg_name#${target_pkg_ver}-${target_pkg_rel}($BASE_ARCH); port needed."
JOB=(${JOB[*]} $p) JOB=(${JOB[*]} $p)
@ -311,7 +311,7 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
echo "Package $pkg_name($TARGET_ARCH) was not built for '$REBUILD_MILESTONE' milestone; rebuild needed." echo "Package $pkg_name($TARGET_ARCH) was not built for '$REBUILD_MILESTONE' milestone; rebuild needed."
JOB=(${JOB[*]} $p) JOB=(${JOB[*]} $p)
else else
echo "Package $pkg_name#${port_pkg_ver}-${port_pkg_rel}($TARGET_ARCH) is up to date." [ "$VERBOSE_MODE" ] && echo "Package $pkg_name#${port_pkg_ver}-${port_pkg_rel}($TARGET_ARCH) is up to date."
fi fi
else else
echo "$p#${port_pkg_ver}-${port_pkg_rel}($BASE_ARCH) is in port repository but $p#${base_pkg_ver}-${base_pkg_rel}($TARGET_ARCH) is in base repository; port needed." echo "$p#${port_pkg_ver}-${port_pkg_rel}($BASE_ARCH) is in port repository but $p#${base_pkg_ver}-${base_pkg_rel}($TARGET_ARCH) is in base repository; port needed."