[arch-dev-public] [PATCH] archrelease: exit if working copy is not committed
Check with svn diff if the PKGBUILD etc has been committed, and exit with an error message if not. Also moved message from commitpkg to here. --- archrelease | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/archrelease b/archrelease index bc9a7d6..6ba6efb 100755 --- a/archrelease +++ b/archrelease @@ -5,7 +5,7 @@ if [ "$1" = "" ]; then exit 1 fi -if [ ! -f "PKGBUILD" ]; then +if [ ! -f PKGBUILD ]; then echo "archrelease: PKGBUILD not found" exit 1 fi @@ -15,6 +15,12 @@ if [ "$(basename $(readlink -f .))" != "trunk" ]; then exit 1 fi +if [ "$(svn diff)" != "" ]; then + echo "archrelease: You have not committed your changes yet!" + echo " Please run 'upgpkg' or 'svn commit' first" + exit 1 +fi + if [ ! -d ../repos/$1 ]; then pushd .. [ -d repos ] || mkdir repos @@ -46,3 +52,4 @@ else popd fi +echo "===> Tagged for $1" -- 1.6.4.4
--- commitpkg | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/commitpkg b/commitpkg index 2f7bb46..7221825 100755 --- a/commitpkg +++ b/commitpkg @@ -94,7 +94,6 @@ for CARCH in ${arch[@]}; do fi archrelease $repo-$CARCH || abort - echo "===> Tagged for $repo-$CARCH" done if [ "${arch[*]}" == "any" ]; then -- 1.6.4.4
participants (1)
-
Francois Charette