tazpkg diff modules/remove @ rev 849

Fix working of modules/reconfigure (thank Robertux for bugreport); small changes.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Tue Oct 20 10:24:52 2015 +0300 (2015-10-20)
parents d6cbd0c5f273
children d62dc010e0ee
line diff
     1.1 --- a/modules/remove	Mon Oct 05 03:53:47 2015 +0300
     1.2 +++ b/modules/remove	Tue Oct 20 10:24:52 2015 +0300
     1.3 @@ -133,13 +133,13 @@
     1.4  			[ $(grep "^$(echo $file | grepesc)$" "$INSTALLED/$mod/files.list" | wc -l) -gt 1 ] && \
     1.5  			continue 2
     1.6  		done
     1.7 -		[ -n "$debug" ] && echo "remove_with_path $root$file"
     1.8 -		remove_with_path $root$file
     1.9 +		debug "remove_with_path ($root$file)"
    1.10 +		remove_with_path "$root$file"
    1.11  	done
    1.12  else
    1.13  	for file in $(cat "$INSTALLED/$PACKAGE/files.list"); do
    1.14 -		[ -n "$debug" ] && echo "remove_with_path $root$file"
    1.15 -		remove_with_path $root$file
    1.16 +		debug "remove_with_path ($root$file)"
    1.17 +		remove_with_path "$root$file"
    1.18  	done
    1.19  fi
    1.20  status
    1.21 @@ -190,7 +190,10 @@
    1.22  	if [ "$answer" -eq 0 ]; then
    1.23  		for i in $REFRESH; do
    1.24  			if [ "$(wc -l < "$INSTALLED/$i")" -gt 1 ]; then
    1.25 -				_ 'Check %s for reinstallation' "$INSTALLED/$i"
    1.26 +				_ 'Package "%s" was modified by "%s" and other packages. It will not be reinstalled.' \
    1.27 +					"${i%/modifiers}" "$PACKAGE"
    1.28 +				_ 'Check "%s" for reinstallation.' "$INSTALLED/$i"
    1.29 +
    1.30  				continue
    1.31  			fi
    1.32  			rm -r "$INSTALLED/$i"