From: Michael Andres <ma@suse.de>
Date: Tue, 10 Jan 2012 12:15:33 +0000 (+0100)
Subject: mkChangelog script fixes
X-Git-Tag: 11.1.0~17
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2Flibzypp.git;a=commitdiff_plain;h=e77d4428b24cd3e5459c6b1210f2751cec6e4eab

mkChangelog script fixes
---

diff --git a/mkChangelog b/mkChangelog
index ba46a7a..12a3a77 100755
--- a/mkChangelog
+++ b/mkChangelog
@@ -179,12 +179,18 @@ while [ "$RES" == "e" ]; do
 	else
 	  Becho "!!! Remember new version $THIS_RELEASE in $VERSIONFILE"
 	  sed -i "s/^# LAST RELEASED:.*$/# LAST RELEASED: $THIS_RELEASE ($THIS_COMPAT)/" $VERSIONFILE
-	  git add "$CHANGESFILE" "$VERSIONFILE" \
-	    && git commit -m "changes $THIS_RELEASE ($THIS_COMPAT)" \
-	    && git tag -m "tagging $THIS_RELEASE" "$THIS_RELEASE" HEAD
-	  Becho "!!!"
-	  Becho "!!! Do not forget to push the commit and the tag: $(Gecho git push --tags)"
-	  Becho "!!!"
+	  if git add "$CHANGESFILE" "$VERSIONFILE" \
+		&& git commit -m "changes $THIS_RELEASE ($THIS_COMPAT)" \
+		  && git tag -m "tagging $THIS_RELEASE" "$THIS_RELEASE" HEAD; then
+	    Becho "!!!"
+	    Becho "!!! Do not forget to push the commit and the tag: $(Gecho git push --tags origin HEAD)"
+	    Becho "!!!"
+	  else
+	    Recho "!!!"
+	    Recho "!!! Commit failed. Check manually. (git reset HEAD~)"
+	    Recho "!!!"
+	    exit 9
+	  fi
 	fi
       }
       ;;