[arch-projects] [devtools] [PATCH] checkpkg: remove checking for old style package names

Allan McRae allan at archlinux.org
Wed Apr 27 23:21:30 EDT 2011


All the packages in the Arch repo have been rebuilt to include the
architecture in their package names so this workaround is no longer
needed.

Signed-off-by: Allan McRae <allan at archlinux.org>
---

This is applied on top of the patch Eric sent just prior to this.

 checkpkg |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/checkpkg b/checkpkg
index feb9c70..e669718 100755
--- a/checkpkg
+++ b/checkpkg
@@ -37,16 +37,11 @@ for _pkgname in ${pkgname[@]}; do
 	else
 		pkgfile=${_pkgname}-${epoch}:${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
 	fi
-	oldstylepkgfile=${_pkgname}-${pkgver}-${pkgrel}${PKGEXT}
 
 	if [ -f "$STARTDIR/$pkgfile" ]; then
 		cp "$STARTDIR/$pkgfile" .
 	elif [ -f "$PKGDEST/$pkgfile" ]; then
 		cp "$PKGDEST/$pkgfile" .
-	elif [ -f "$STARTDIR/$oldstylepkgfile" ]; then
-		cp "$STARTDIR/$oldstylepkgfile" .
-	elif [ -f "$PKGDEST/$oldstylepkgfile" ]; then
-		cp "$PKGDEST/$oldstylepkgfile" .
 	else
 		echo "File \"$pkgfile\" doesn't exist"
 		exit 1
-- 
1.7.5



More information about the arch-projects mailing list