diff options
author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-11-28 02:47:33 +0000 |
---|---|---|
committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-11-28 02:47:33 +0000 |
commit | 25adde3f586f0bfe4b3d8a59b26080306f1721e4 (patch) | |
tree | 7f3b9fb946095f696c5d8a680d1c7a3cd0f66b4b /trunk/src/createpkg | |
parent | 3896f087f2db87e5e3dcce073e99f6780a336d6e (diff) | |
download | simplepkg-25adde3f586f0bfe4b3d8a59b26080306f1721e4.tar.gz simplepkg-25adde3f586f0bfe4b3d8a59b26080306f1721e4.tar.bz2 |
cleanup
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@577 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk/src/createpkg')
-rw-r--r-- | trunk/src/createpkg | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/trunk/src/createpkg b/trunk/src/createpkg index 81a1a70..ce9c3a5 100644 --- a/trunk/src/createpkg +++ b/trunk/src/createpkg @@ -561,30 +561,20 @@ 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 - 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 $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 - else - rm $file + 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 $candidate`" != "$PACKAGE_VERSION" ] || \ + [ "`package_arch $candidate`" != "$PACKAGE_ARCH" ] || \ + [ "`package_build $candidate`" != "$PACKAGE_BUILD" ]; then + svn_del $file fi done for file in `find $MAKEPKG_REPOS -name "$PACKAGE.slack-required"`; do - if svn_check $file; then - chown_svn $MAKEPKG_REPOS && chgrp_svn $MAKEPKG_REPOS - if [ $MOVE_SLACK_REQUIRED -eq $off ]; then - su_svn del --force $file - elif [ ! -z "$SLACK_REQUIRED" ] && [ "$NEW_REPOS/$PACKAGE.slack-required" != "$file" ]; then - su_svn del --force $file - fi - else - rm $file + if [ $MOVE_SLACK_REQUIRED -eq $off ]; then + svn_del $file + elif [ ! -z "$SLACK_REQUIRED" ] && [ "$NEW_REPOS/$PACKAGE.slack-required" != "$file" ]; then + svn_del $file fi done |