From 90f62989c1444d9dd028137d45aadf84307eebf8 Mon Sep 17 00:00:00 2001 From: rhatto Date: Fri, 28 Nov 2008 01:31:33 +0000 Subject: fixes git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@574 04377dda-e619-0410-9926-eae83683ac58 --- trunk/src/createpkg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'trunk/src') diff --git a/trunk/src/createpkg b/trunk/src/createpkg index f5925a0..2e4d087 100644 --- a/trunk/src/createpkg +++ b/trunk/src/createpkg @@ -562,11 +562,11 @@ if [ $REMOVE_OLD_PACKAGE -eq $on ]; then # Using -mindepth 2 so it doesn't delete the new package for file in `find . -mindepth 2 -name "$PACKAGE-*-*-*.tgz" -o -name "$PACKAGE-*-*-*.meta"`; do if svn_check $file; then - file="`echo $file | sed -e 's/\.meta/\.tgz/'`" # otherwise package info functions will fail + candidate="`echo $file | sed -e 's/\.meta/\.tgz/'`" # otherwise package info functions can fail # Just delete packages with different arch, version or build number - if [ "`package_version $file`" != "$PACKAGE_VERSION" ] || \ - [ "`package_arch $file`" != "$PACKAGE_ARCH" ] || \ - [ "`package_build $file`" != "$PACKAGE_BUILD" ]; then + if [ "`package_version $candidate`" != "$PACKAGE_VERSION" ] || \ + [ "`package_arch $candidate`" != "$PACKAGE_ARCH" ] || \ + [ "`package_build $candidate`" != "$PACKAGE_BUILD" ]; then chown_svn $MAKEPKG_REPOS && chgrp_svn $MAKEPKG_REPOS su_svn del --force $file fi -- cgit v1.2.3