db-move, db-remove: Also accept pkgname, not just pkgbase!parabola/20180716

1 files changed, 4 insertions, 8 deletions

diff --git a/db-functions b/db-functions
index 52c3e45..6356792 100644
--- a/db-functions
+++ b/db-functions
@@ -457,22 +457,18 @@ arch_expac() {
 	expac --config="${dir}/pacman.conf" --sync "${args[@]}"
 }
 
-# usage: arch_expac_pkgbase repo arch format pkgbase
-# Like arch_expac, but 'target' is a pkgbase rather than a pkgname.
+# usage: arch_expac_pkgbase repo arch format <pkgname|pkgbase>
+# Like arch_expac, but 'target' may be a pkgbase, instead of the usual
+# pkgname.
 # Only accepts one target.
 arch_expac_pkgbase() {
 	local repo=$1
 	local arch=$2
 	local format=$3
 	local pkgbase=$4
-	# makepkg <5.1 didn't set pkgbase in .PKGINFO for non-split
-	# packages when when pkgbase==pkgname; so until all packages
-	# have been rebuilt with makepkg 5.1, we need to look at
-	# pkgbase (%e) and pkgname (%n) when filtering based on
-	# pkgbase.
 	arch_expac "$repo" "$arch" "%e %n $format" |
 		awk -F' ' -v pkgbase="$pkgbase" \
-			'$1 == pkgbase || ($1 == "(null)" && $2 == pkgbase)' |
+			'$1 == pkgbase || $2 == pkgbase' |
 		cut -d' ' -f3-
 }