spk rev 83

spk-up: small fixes
author Christophe Lincoln <pankso@slitaz.org>
date Thu May 24 18:31:24 2012 +0200 (2012-05-24)
parents ee3163f781b3
children b33832c00a1a
files spk-up
line diff
     1.1 --- a/spk-up	Thu May 24 18:19:22 2012 +0200
     1.2 +++ b/spk-up	Thu May 24 18:31:24 2012 +0200
     1.3 @@ -100,8 +100,8 @@
     1.4  	for i in $extras; do
     1.5  		extras="$extradb/$i"
     1.6  	done
     1.7 -	[ -d "$extradb/local" ] && localdb="$extradb/local"
     1.8 -	echo "$localdb $extras $PKGS_DB"
     1.9 +	[ -d "$extradb/local" ] && local="$extradb/local"
    1.10 +	echo "$local $extras $PKGS_DB"
    1.11  }
    1.12  
    1.13  # Types: blocked, new build or new version
    1.14 @@ -141,7 +141,7 @@
    1.15  		$installed.$SUM | awk '{print $1}')
    1.16  
    1.17  	# Skip up-to-date local packages
    1.18 -	if [ -d "$extradb/local" ] && fgrep -q "$sum  $PACKAGE-" $extradb/local/packages.$SUM; then
    1.19 +	if [ -d "$localdb" ] && fgrep -q "$sum  $PACKAGE-" $localdb/packages.$SUM; then
    1.20  		reponame=$(gettext "Local")
    1.21  		return 0
    1.22  	fi
    1.23 @@ -156,7 +156,7 @@
    1.24  			*) reponame=$(gettext "Extra") ;;
    1.25  		esac
    1.26  		# Overwrite: Local have priority
    1.27 -		if [ -d "$extradb/local" ] && $(grep -q "^$PACKAGE |" $extradb/local/packages.desc); then
    1.28 +		if [ -d "$localdb" ] && fgrep -q "$sum  $PACKAGE-" $localdb/packages.$SUM; then
    1.29  			reponame=$(gettext "Local")
    1.30  		fi
    1.31