From 7034eed1f7ceec379b34f8dd782fb986c7165ad4 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sat, 29 Jun 2013 00:45:43 -0600
Subject: use the get_full_version from libremessages (actually, common.sh)

It works properly when split packages have different versions.
---
 db-move | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'db-move')

diff --git a/db-move b/db-move
index 045f33c..6e8796d 100755
--- a/db-move
+++ b/db-move
@@ -34,10 +34,6 @@ for pkgbase in ${args[@]:2}; do
 				die "Could not read pkgname"
 			fi
 
-			pkgver=$(. "${xbsrepo_from}/PKGBUILD"; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}))
-			if [ -z "${pkgver}" ]; then
-				die "Could not read pkgver"
-			fi
 
 			if [ "${pkgarch}" == 'any' ]; then
 				tarches=(${ARCHES[@]})
@@ -46,6 +42,10 @@ for pkgbase in ${args[@]:2}; do
 			fi
 
 			for pkgname in ${pkgnames[@]}; do
+				pkgver=$(. "${xbsrepo_from}/PKGBUILD"; get_full_version ${pkgname})
+				if [ -z "${pkgver}" ]; then
+					die "Could not read pkgver"
+				fi
 				for tarch in ${tarches[@]}; do
 					getpkgfile "${ftppath_from}/${tarch}/"${pkgname}-${pkgver}-${pkgarch}${PKGEXT} >/dev/null
 				done
@@ -73,9 +73,9 @@ for pkgbase in ${args[@]:2}; do
 				tarches=("${pkgarch}")
 			fi
 			pkgnames=($(. "${dir_to}/PKGBUILD"; echo ${pkgname[@]}))
-			pkgver=$(. "${dir_to}/PKGBUILD"; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel}))
 
 			for pkgname in ${pkgnames[@]}; do
+				pkgver=$(. "${dir_to}/PKGBUILD"; get_full_version ${pkgname})
 				for tarch in ${tarches[@]}; do
 					pkgpath=$(getpkgfile "${ftppath_from}/${tarch}/"${pkgname}-${pkgver}-${pkgarch}${PKGEXT})
 					pkgfile="${pkgpath##*/}"
-- 
cgit v1.2.3-2-g168b