From a55b3ac88629bd7d3de5f5edd45f85c9db32b673 Mon Sep 17 00:00:00 2001
From: René Neumann <rene.neumann@in.tum.de>
Date: Thu, 23 Feb 2012 19:13:44 +0100
Subject: Make the stg-version into a variable ... no need to run python
 multiple times

---
 .zsh/functions/cci | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to '.zsh/functions/cci')

diff --git a/.zsh/functions/cci b/.zsh/functions/cci
index 6d10917..22441d7 100644
--- a/.zsh/functions/cci
+++ b/.zsh/functions/cci
@@ -13,11 +13,6 @@ _ask_$0 ()
     fi
 }
 
-_stg_v_$0 ()
-{
-    python -c 'from stgit.builtin_version import version; print version'
-}
-
 if [[ $# == 0 ]]; then
     echo "No message given. Aborting."
     return 1
@@ -25,6 +20,10 @@ fi
 
 local message=$1
 local tok=__cci__
+local stg_v=$(python -c 'from stgit.builtin_version import version; print version')
+
+# bail out on errors with the python thing
+(( $? )) && return
 
 pushd -q ~
 
@@ -64,7 +63,7 @@ cstg commit $tok || return
 
 # from 0.16 onwards stg repushes the patches ... pop them again
 # this is needed to make the `config push` work
-if is-at-least 0.16 $(_stg_v_$0); then
+if is-at-least 0.16 $stg_v; then
     echo ">>> Popping patches, stg thought it had to re-apply"
     cstg pop -a -k || return
 fi
-- 
cgit v1.2.3-54-g00ecf