]> gitweb.fluxo.info Git - simplepkg.git/commitdiff
fixes
authorrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>
Fri, 28 Nov 2008 01:31:33 +0000 (01:31 +0000)
committerrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>
Fri, 28 Nov 2008 01:31:33 +0000 (01:31 +0000)
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@574 04377dda-e619-0410-9926-eae83683ac58

trunk/src/createpkg

index f5925a0c285340c2ca6422d89fda0f0c66d27537..2e4d087757b3c370e917491190d5a7a598dec0a2 100644 (file)
@@ -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