Permalink
Browse files

Merge branch 'master' of github.com:benweissmann/zephyr-mobile

  • Loading branch information...
2 parents 33bc183 + 5692f56 commit 8ad22827a704083fb4842265f5eeeec598481fa8 @benweissmann committed Apr 17, 2012
Showing with 7 additions and 2 deletions.
  1. +1 −1 android-client/aXMLRPC
  2. +6 −1 zserv/bin/zserv-bootstrap
@@ -185,7 +185,12 @@ while read line; do
set $line
case "$1" in
"START")
- runserver && echo "!ZSERV START SUCCESS" || echo "!ZSERV START FAILURE"
+ # For testing
+ if [[ -e $HOME/.zserv_fail_start ]]; then
+ echo "!ZSERV START FAILURE"
+ else
+ runserver && echo "!ZSERV START SUCCESS" || echo "!ZSERV START FAILURE"
+ fi
;;
"INFO")
info

0 comments on commit 8ad2282

Please sign in to comment.