wok-6.x rev 5874

busybox: fix upgrade
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Jul 20 18:25:27 2010 +0200 (2010-07-20)
parents aafdac59e123
children 3ec9d44d30f6
files busybox-pam/receipt busybox/receipt
line diff
     1.1 --- a/busybox-pam/receipt	Tue Jul 20 19:06:03 2010 +0200
     1.2 +++ b/busybox-pam/receipt	Tue Jul 20 18:25:27 2010 +0200
     1.3 @@ -93,6 +93,11 @@
     1.4  	answer=""
     1.5  	while read i ; do
     1.6  		[ -f $1$i ] || continue
     1.7 +		case "$i" in
     1.8 +		/bin/busybox) continue ;;
     1.9 +		*bin/*) ;;
    1.10 +		*) continue ;;
    1.11 +		esac
    1.12  		if [ -z "$answer" ]; then
    1.13  			echo -n "Keep installed GNU utilities ? "
    1.14  			read answer
     2.1 --- a/busybox/receipt	Tue Jul 20 19:06:03 2010 +0200
     2.2 +++ b/busybox/receipt	Tue Jul 20 18:25:27 2010 +0200
     2.3 @@ -86,6 +86,11 @@
     2.4  	answer=""
     2.5  	while read i ; do
     2.6  		[ -f $1$i ] || continue
     2.7 +		case "$i" in
     2.8 +		/bin/busybox) continue ;;
     2.9 +		*bin/*) ;;
    2.10 +		*) continue ;;
    2.11 +		esac
    2.12  		if [ -z "$answer" ]; then
    2.13  			echo -n "Keep installed GNU utilities ? "
    2.14  			read -t 30 answer	# by default: keep