diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-11-28 18:54:13 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-11-28 18:54:13 +0000 |
| commit | 7ccd081e2da12aa0a1a534bf2567951f3f945b47 (patch) | |
| tree | eb871dd27a3e4384a8ca7a9aa680d18fdec7f059 /trunk | |
| parent | 79959988e9333db445a26a274f71517819a66161 (diff) | |
| download | simplepkg-7ccd081e2da12aa0a1a534bf2567951f3f945b47.tar.gz simplepkg-7ccd081e2da12aa0a1a534bf2567951f3f945b47.tar.bz2 | |
createpkg: deleting duplicated packages in different folders
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@609 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk')
| -rw-r--r-- | trunk/src/createpkg | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/trunk/src/createpkg b/trunk/src/createpkg index aae327a..c6df151 100644 --- a/trunk/src/createpkg +++ b/trunk/src/createpkg @@ -376,10 +376,11 @@ 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, build number or folder if [ "`package_version $candidate`" != "$PACKAGE_VERSION" ] || \ [ "`package_arch $candidate`" != "$PACKAGE_ARCH" ] || \ - [ "`package_build $candidate`" != "$PACKAGE_BUILD" ]; then + [ "`package_build $candidate`" != "$PACKAGE_BUILD" ] || \ + [ "`dirname $candidate`" != "`dirname $makepkg_repos/$SUBFOLDER/$PKG_NAME`" ]; then svn_del $file fi done |