diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-11-27 20:36:45 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-11-27 20:36:45 +0000 |
| commit | 66ade94289ea598027cafea77b938735edd7ec43 (patch) | |
| tree | 7ec2014d14ddce924ca893dda922ca76b47285be | |
| parent | 1cd32aa1ac41306594bb7709356f2c57dbf8bdc9 (diff) | |
| download | simplepkg-66ade94289ea598027cafea77b938735edd7ec43.tar.gz simplepkg-66ade94289ea598027cafea77b938735edd7ec43.tar.bz2 | |
minor fix
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@555 04377dda-e619-0410-9926-eae83683ac58
| -rw-r--r-- | trunk/lib/common.sh | 3 | ||||
| -rw-r--r-- | trunk/src/createpkg | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh index 5538668..5b69772 100644 --- a/trunk/lib/common.sh +++ b/trunk/lib/common.sh @@ -813,8 +813,6 @@ function gen_meta { if [ ! -f $1 ]; then return 1 - else - echo "Creating metafile for $1" fi if [ "`echo $1|grep -E '(.*{1,})\-(.*[\.\-].*[\.\-].*).tgz[ ]{0,}$'`" == "" ]; then @@ -847,6 +845,7 @@ function gen_meta { tar xzfO $1 install/slack-desc | grep -E '\w+\:' | grep -v '^#' >> $LOCATION/$METAFILE echo "" >> $LOCATION/$METAFILE + echo "Created metafile for `basename $1`" svn_add $LOCATION/$METAFILE diff --git a/trunk/src/createpkg b/trunk/src/createpkg index 804559a..dcc3baa 100644 --- a/trunk/src/createpkg +++ b/trunk/src/createpkg @@ -548,15 +548,15 @@ if [ $REMOVE_OLD_PACKAGE -eq $on ]; then if svn_check $file; then # Just delete packages with different arch, version or build number if [ "`package_version $file`" != "$PACKAGE_VERSION" ] || \ - [ "`package_arch $file`" != "$PACKAGE_ARCH" ] || \ - [ "`package_build $file`" != "$PACKAGE_BUILD" ]; then + [ "`package_arch $file`" != "$PACKAGE_ARCH" ] || \ + [ "`package_build $file`" != "$PACKAGE_BUILD" ]; then svn del --force $file fi else rm $file fi done - + for file in `find $MAKEPKG_REPOS -name "$PACKAGE.slack-required"`; do if svn_check $file; then if [ $MOVE_SLACK_REQUIRED -eq $off ]; then @@ -629,4 +629,6 @@ fi ) +echo "Package saved at $NEW_REPOS/$PKG_NAME" + exit $EXIT_CODE |