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

When removing/stowning a package, get the version of the

Browse source 
package installed from the db and not from template file.

This fixes the following problem:

* package foo-1.0 is installed but the template file only has
  foo-1.1, therefore it thinks the pkg is not installed.

--HG--
extra : convert_revision : e5ad68c50ba508a882f9c7eb0c30ee689da5d27f
This commit is contained in:
Juan RP 2008-12-09 16:45:01 +01:00
parent b99de35817
commit c4be9a5aba
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
xbps.sh
View file

@ -1277,6 +1277,7 @@ list_pkg_files()
remove_pkg() remove_pkg()
{ {
local pkg="$1" local pkg="$1"
local ver=
[ -z $pkg ] && msg_error "unexistent package, aborting." [ -z $pkg ] && msg_error "unexistent package, aborting."
@ -1296,12 +1297,13 @@ remove_pkg()
return $? return $?
fi fi
if [ ! -d "$XBPS_DESTDIR/$pkg-$version" ]; then ver=$($XBPS_PKGDB_CMD version $pkg)
if [ ! -d "$XBPS_DESTDIR/$pkg-$ver" ]; then
msg_error "cannot find package on $XBPS_DESTDIR." msg_error "cannot find package on $XBPS_DESTDIR."
fi fi
unstow_pkg $pkg unstow_pkg $pkg
rm -rf $XBPS_DESTDIR/$pkg-$version rm -rf $XBPS_DESTDIR/$pkg-$ver
return $? return $?
} }
@ -1357,6 +1359,7 @@ unstow_pkg()
{ {
local pkg="$1" local pkg="$1"
local f= local f=
local ver=
[ -z $pkg ] && msg_error "template wasn't specified?" [ -z $pkg ] && msg_error "template wasn't specified?"
@ -1364,12 +1367,17 @@ unstow_pkg()
run_file $XBPS_TEMPLATESDIR/$pkg.tmpl run_file $XBPS_TEMPLATESDIR/$pkg.tmpl
fi fi
ver=$($XBPS_PKGDB_CMD version $pkg)
if [ -z "$ver" ]; then
msg_error "$pkg is not installed."
fi
# #
# You cannot unstow a meta-template. # You cannot unstow a meta-template.
# #
[ "$build_style" = "meta-template" ] && return 0 [ "$build_style" = "meta-template" ] && return 0
cd $XBPS_DESTDIR/$pkgname-$version || exit 1 cd $XBPS_DESTDIR/$pkgname-$ver || exit 1
[ ! -f .xbps-filelist ] && exit 1 [ ! -f .xbps-filelist ] && exit 1
for f in $(cat .xbps-filelist|sort -ur); do for f in $(cat .xbps-filelist|sort -ur); do
@ -1390,7 +1398,7 @@ unstow_pkg()
fi fi
done done
$XBPS_PKGDB_CMD unregister $pkgname $version $XBPS_PKGDB_CMD unregister $pkgname $ver
return $? return $?
} }