Commit e197f6d3 authored by Allan McRae's avatar Allan McRae Committed by Pierre Schmitz
Browse files

checkpkg: remove checking for old style package names 



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: default avatarAllan McRae <allan@archlinux.org>
Signed-off-by: default avatarPierre Schmitz <pierre@archlinux.de>
parent c45e5bbf

checkpkg

+0 −5
Original line number Diff line number Diff line
@@ -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