From cd4a2c19d1255f4e450423ea6e044c2e0438c623 Mon Sep 17 00:00:00 2001 From: rhatto Date: Fri, 25 Sep 2009 17:35:55 +0000 Subject: createpkg: fix at remove_old_package_data git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@819 04377dda-e619-0410-9926-eae83683ac58 --- trunk/src/createpkg | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/trunk/src/createpkg b/trunk/src/createpkg index cddf6ba..ebebf66 100644 --- a/trunk/src/createpkg +++ b/trunk/src/createpkg @@ -432,12 +432,14 @@ function remove_old_package_data { candidate="`echo $file | sed -e 's/\.meta$/\.tgz/'`" # otherwise PACKAGE info functions can fail candidate="`echo $candidate | sed -e 's/\.asc$//'`" # otherwise PACKAGE info functions can fail # 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" ] || \ - [ "`package_ext $candidate`" != "$PACKAGE_EXT" ] || \ - [ "`dirname $candidate | sed -e 's/^\.\///'`" != "`dirname $SUBFOLDER/$PKG_NAME | sed -e 's/^\.\///'`" ]; then - svn_del $file + if [ "`package_name $candidate`" == "$PACKAGE" ]; then + if [ "`package_version $candidate`" != "$PACKAGE_VERSION" ] || \ + [ "`package_arch $candidate`" != "$PACKAGE_ARCH" ] || \ + [ "`package_build $candidate`" != "$PACKAGE_BUILD" ] || \ + [ "`package_ext $candidate`" != "$PACKAGE_EXT" ] || \ + [ "`dirname $candidate | sed -e 's/^\.\///'`" != "`dirname $SUBFOLDER/$PKG_NAME | sed -e 's/^\.\///'`" ]; then + svn_del $file + fi fi done -- cgit v1.2.3