]> gitweb.fluxo.info Git - puppet-puppet.git/commitdiff
Exit on errors at the update script
authorSilvio Rhatto <rhatto@riseup.net>
Sat, 26 Jan 2013 15:58:04 +0000 (13:58 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Sat, 26 Jan 2013 15:58:04 +0000 (13:58 -0200)
files/update-puppet-conf.sh

index 5e9adae43ad2340a902c01685f09fdbc2f02cbb5..9a2dd65b9e2100501a37e6c24da6b55edd43a3ce 100644 (file)
@@ -12,9 +12,9 @@ unset GIT_DIR
 
 if [ -d "${PUPPET_DIR}/.git" ] && [ -d "${ORIGIN_DIR}" ]; then
   cd ${PUPPET_DIR}
-  #git checkout -f
-  git reset HEAD --hard
-  git pull ${ORIGIN_DIR} master
+  #git checkout -f               || exit $?
+  git reset HEAD --hard         || exit $?
+  git pull ${ORIGIN_DIR} master || exit $?
   # See https://github.com/git/git/commit/c1c259e225cf39c7353c673ad2c7c84450d909c1
   git submodule update --init | grep -v "^Submodule "
   git clean -d -f