diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-11-28 18:01:49 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-11-28 18:01:49 +0000 |
| commit | 4aff37f79ce11a2cc7ef1003f07b246e3999ae67 (patch) | |
| tree | 78d59994ab64a56a9818bce7098fb431cda5a945 /trunk | |
| parent | 4efaebc4ed4d02b358e134e9251780858f135a4a (diff) | |
| download | simplepkg-4aff37f79ce11a2cc7ef1003f07b246e3999ae67.tar.gz simplepkg-4aff37f79ce11a2cc7ef1003f07b246e3999ae67.tar.bz2 | |
fixes
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@606 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk')
| -rw-r--r-- | trunk/src/createpkg | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/trunk/src/createpkg b/trunk/src/createpkg index 4642a07..544eb72 100644 --- 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 |