fixes

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@606 04377dda-e619-0410-9926-eae83683ac58

diff --git a/trunk/src/createpkg b/trunk/src/createpkg
index 4642a0779e81f8bffddb958debc595b430145636..544eb721e15a704172603da7f793e6395e71a1bd 100644 (file)
--- a/trunk/src/createpkg
+++ b/trunk/src/createpkg
@@ -341,7 +341,7 @@ function remove_old_package_data {
   # Remove old packages from repository tree
   # usage: remove_old_package_data <repository_folder>
 
-  if [ -z "$2" ]; then
+  if [ -z "$1" ]; then
     return 1
   fi
 
@@ -374,7 +374,7 @@ function remove_old_package_data {
       # 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
         candidate="`echo $file | sed -e 's/\.meta/\.tgz/'`" # otherwise PACKAGE info functions can fail
-        # Just delete PACKAGEs with different arch, version or build number
+        # Just delete packages with different arch, version or build number
         if [ "`package_version $candidate`" != "$PACKAGE_VERSION" ] || \
            [ "`package_arch $candidate`" != "$PACKAGE_ARCH" ] || \
            [ "`package_build $candidate`" != "$PACKAGE_BUILD" ]; then
@@ -385,7 +385,7 @@ function remove_old_package_data {
       for file in `find $makepkg_repos -name "$PACKAGE.slack-required"`; do
         if [ $MOVE_SLACK_REQUIRED -eq $off ]; then
           svn_del $file
-        elif [ ! -z "$SLACK_REQUIRED" ] && [ "$repository_folder/$SUBFOLDER/$PACKAGE.slack-required" != "$file" ]; then
+        elif [ ! -z "$SLACK_REQUIRED" ] && [ "$makepkg_repos/$SUBFOLDER/$PACKAGE.slack-required" != "$file" ]; then
           svn_del $file
         fi
       done