Am Freitag, 26. August 2011, 08:47:28 schrieb Adrian Schröter:
Am Freitag, 26. August 2011, 08:43:06 schrieb Markus Lehtonen:
Don't skip tarball creation because otherwise the tarball is completely deleted as bs_service deletes all old _service* files.
Ups, right. I tried to solve this differently in openSUSE:Tools now, because I want to avoid that the same tar ball gets re-generated and may get stored twice in source server due to a different time stamp (for example in gzip header).
Again new version. Removed the code as you suggested, but fixed gzip handling in recompress service instead. bye adrian
again, please test :) adrian
---
tar_scm | 20 -------------------- 1 files changed, 0 insertions(+), 20 deletions(-)
diff --git a/tar_scm b/tar_scm index 34b50f9..9278569 100644 --- a/tar_scm +++ b/tar_scm @@ -142,11 +142,6 @@ if [ "$MYSCM" == "svn" ]; then
fi
NEWVERSION=`LC_ALL=C svn info | sed -n 's,^Last Changed Rev: \(.*\),\1,p'` cd - - if [ "$OLDVERSION" == "$NEWVERSION" ]; then - # cleanup and skip - rm -rf "$TAR_DIRECTORY" - exit 0 - fi
mv "$TAR_DIRECTORY" "${FILE}" || exit 1
else
# new checkout
@@ -183,11 +178,6 @@ elif [ "$MYSCM" == "git" ]; then
fi NEWVERSION=`git show --pretty=%at | head -n 1` cd -
- if [ "$OLDVERSION" == "$NEWVERSION" ]; then - # cleanup and skip - rm -rf "$TAR_DIRECTORY" - exit 0 - fi
mv "$TAR_DIRECTORY" "${FILE}" || exit 1
else
# new checkout
@@ -212,11 +202,6 @@ elif [ "$MYSCM" == "hg" ]; then
hg pull || exit 1 NEWVERSION=`hg id -i -rtip` cd -
- if [ "$OLDVERSION" == "$NEWVERSION" ]; then - # cleanup and skip - rm -rf "$TAR_DIRECTORY" - exit 0 - fi
mv "$TAR_DIRECTORY" "${FILE}" || exit 1
else
# new checkout
@@ -245,11 +230,6 @@ elif [ "$MYSCM" == "bzr" ]; then
fi NEWVERSION=`bzr revno` cd -
- if [ "$OLDVERSION" == "$NEWVERSION" ]; then - # cleanup and skip - rm -rf "$TAR_DIRECTORY" - exit 0 - fi
mv "$TAR_DIRECTORY" "${FILE}" || exit 1
else
# new checkout -- Adrian Schroeter SUSE Linux Products GmbH email: adrian@suse.de
-- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org