jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

xbps-src: fix some messages to show correct pkgname/version touple.

Browse source
This commit is contained in:
Juan RP 2011-10-26 16:59:28 +02:00
parent 1be478b255
commit 4efdddd88e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
xbps-src/shutils/pkgtarget_funcs.sh.in
View file

@ -218,11 +218,11 @@ remove_pkg()
set_tmpl_common_vars set_tmpl_common_vars
pkg="${subpkg}-${version}" pkg="${subpkg}-${version}"
if [ -d "$XBPS_DESTDIR/${pkg}" ]; then if [ -d "$XBPS_DESTDIR/${pkg}" ]; then
msg_normal "${pkgver}: removing files from destdir...\n" msg_normal "${pkg}: removing files from destdir...\n"
rm -rf "$XBPS_DESTDIR/${pkg}" rm -rf "$XBPS_DESTDIR/${pkg}"
found=1 found=1
else else
msg_warn "${pkgver}: not installed in destdir!\n" msg_warn "${pkg}: not installed in destdir!\n"
fi fi
# Remove leftover files in $wrksrc. # Remove leftover files in $wrksrc.
if [ -f "${wrksrc}/.xbps_do_install_${subpkg}_done" ]; then if [ -f "${wrksrc}/.xbps_do_install_${subpkg}_done" ]; then
@ -233,7 +233,7 @@ remove_pkg()
pkg="${pkgname}-${version}" pkg="${pkgname}-${version}"
if [ -d "$XBPS_DESTDIR/${pkg}" ]; then if [ -d "$XBPS_DESTDIR/${pkg}" ]; then
msg_normal "${pkgver}: removing files from destdir...\n" msg_normal "${pkg}: removing files from destdir...\n"
rm -rf "$XBPS_DESTDIR/${pkg}" rm -rf "$XBPS_DESTDIR/${pkg}"
found=1 found=1
fi fi
@ -246,7 +246,7 @@ remove_pkg()
if [ -n "$found" ]; then if [ -n "$found" ]; then
return 0 return 0
else else
msg_warn "${pkgver}: not installed in destdir!\n" msg_warn "${pkg}: not installed in destdir!\n"
fi fi
fi fi