From 710a7b8509913f3c04f03c3d6d556a26eb333aa3 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 16 Dec 2008 10:22:24 +0100
Subject: [PATCH] Move pkg metadata to /var/cache/xbps/$pkgname.

--HG--
extra : convert_revision : 70e1199e8f7e577e0c8fc20bb8643fe6fca31bc7
---
 utils/sh/pkgtarget_funcs.sh | 2 +-
 utils/sh/stow_funcs.sh      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/utils/sh/pkgtarget_funcs.sh b/utils/sh/pkgtarget_funcs.sh
index e9e522883e..598737e9b3 100644
--- a/utils/sh/pkgtarget_funcs.sh
+++ b/utils/sh/pkgtarget_funcs.sh
@@ -130,7 +130,7 @@ list_pkg_files()
 	ver=$($XBPS_PKGDB_CMD version $pkg)
 	[ -z "$ver" ] && msg_error "$pkg is not installed."
 
-	cat $XBPS_PKGMETADIR/$pkg-$ver/flist
+	cat $XBPS_PKGMETADIR/$pkg/flist
 }
 
 #
diff --git a/utils/sh/stow_funcs.sh b/utils/sh/stow_funcs.sh
index a294797c8b..810b429f7e 100644
--- a/utils/sh/stow_funcs.sh
+++ b/utils/sh/stow_funcs.sh
@@ -55,7 +55,7 @@ stow_pkg()
 
 	# Copy metadata files into masterdir.
 	if [ -f xbps-metadata/flist -a -f xbps-metadata/props.plist ]; then
-		local metadir=$XBPS_PKGMETADIR/$pkgname-$version
+		local metadir=$XBPS_PKGMETADIR/$pkgname
 		mkdir -p $metadir
 		cp -f xbps-metadata/flist $metadir
 		cp -f xbps-metadata/props.plist $metadir
@@ -104,7 +104,7 @@ unstow_pkg()
 		msg_error "$pkg is not installed."
 	fi
 
-	cd $XBPS_PKGMETADIR/$pkgname-$version || exit 1
+	cd $XBPS_PKGMETADIR/$pkgname || exit 1
 	if [ ! -f flist ]; then
 		msg_error "$pkg is incomplete, missing flist."
 	elif [ ! -O flist ]; then
@@ -131,7 +131,7 @@ unstow_pkg()
 	done
 
 	# Remove metadata dir.
-	rm -rf $XBPS_PKGMETADIR/$pkgname-$version
+	rm -rf $XBPS_PKGMETADIR/$pkgname
 
 	$XBPS_PKGDB_CMD unregister $pkgname $ver
 	return $?