From e29912574f9725d3c3379d180ebb434a5b7ea1e9 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 24 Oct 2011 19:57:45 +0200
Subject: [PATCH] xbps-src: 'checkvers' target even faster.

---
 xbps-src/shutils/check_installed_packages.sh | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/xbps-src/shutils/check_installed_packages.sh b/xbps-src/shutils/check_installed_packages.sh
index a5c4973643..0856afbe57 100644
--- a/xbps-src/shutils/check_installed_packages.sh
+++ b/xbps-src/shutils/check_installed_packages.sh
@@ -38,24 +38,25 @@ check_installed_packages()
 	msg_normal "Checking for newer packages from srcpkgs, please wait...\n"
 	for f in $(${XBPS_BIN_CMD} list|awk '{print $1}'); do
 		lpkgn=$(${XBPS_PKGDB_CMD} getpkgname ${f})
-		lpkgver=$(${XBPS_PKGDB_CMD} getpkgversion ${f})
 
-		if [ ! -r ${XBPS_SRCPKGDIR}/${lpkgn}/template ]; then
-			msg_warn "Installed package ${f} not available as source pkg, skipping.\n"
-			continue
-		fi
-		. ${XBPS_SRCPKGDIR}/${lpkgn}/template
 		if [ -r ${XBPS_SRCPKGDIR}/${lpkgn}/${lpkgn}.template ]; then
+			. ${XBPS_SRCPKGDIR}/${lpkgn}/template
 			unset revision
 			sourcepkg=$pkgname
 			. ${XBPS_SRCPKGDIR}/${lpkgn}/${lpkgn}.template
+		else
+			if [ ! -r ${XBPS_SRCPKGDIR}/${lpkgn}/template ]; then
+				msg_warn "Installed package ${f} not available as source pkg, skipping.\n"
+				continue
+			fi
+			. ${XBPS_SRCPKGDIR}/${lpkgn}/template
 		fi
 		if [ -n "$revision" ]; then
-			srcpkgver="${version}_${revision}"
+			srcpkgver="${lpkgn}-${version}_${revision}"
 		else
-			srcpkgver="${version}"
+			srcpkgver="${lpkgn}-${version}"
 		fi
-		${XBPS_CMPVER_CMD} ${lpkgver} ${srcpkgver}
+		${XBPS_CMPVER_CMD} ${f} ${srcpkgver}
 		rv=$?
 		if [ $rv -eq 255 ]; then
 			echo "[$XBPS_MASTERDIR] ${f} < ${srcpkgver} [srcpkgs]"