commit c47918ee89d3192399e1d523ed15ec30234c68e3 Author: Mike Perry mikeperry-git@fscked.org Date: Thu Jul 25 20:51:44 2013 +0200

Stop relocating build.log on failure.

It seems to confuse people and conflicts with gitian's output messages. Also, the build now stops, so the logs aren't overwritten anymore. --- gitian/mkbundle-linux.sh | 6 +++--- gitian/mkbundle-mac.sh | 6 +++--- gitian/mkbundle-windows.sh | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 307b2c0..91156cd 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -103,7 +103,7 @@ then ./bin/gbuild -j $NUM_PROCS --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/linux/gitian-tor.yml if [ $? -ne 0 ]; then - mv var/build.log ./tor-fail-linux.log.`date +%Y%m%d%H%M%S` + #mv var/build.log ./tor-fail-linux.log.`date +%Y%m%d%H%M%S` exit 1 fi

@@ -126,7 +126,7 @@ then ./bin/gbuild -j $NUM_PROCS --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/linux/gitian-firefox.yml if [ $? -ne 0 ]; then - mv var/build.log ./firefox-fail-linux.log.`date +%Y%m%d%H%M%S` + #mv var/build.log ./firefox-fail-linux.log.`date +%Y%m%d%H%M%S` exit 1 fi

@@ -150,7 +150,7 @@ then ./bin/gbuild -j $NUM_PROCS --commit https-everywhere=$HTTPSE_TAG,tor-launcher=$TORLAUNCHER_TAG,torbutton=$TORBUTTON_TAG $DESCRIPTOR_DIR/linux/gitian-bundle.yml if [ $? -ne 0 ]; then - mv var/build.log ./bundle-fail-linux.log.`date +%Y%m%d%H%M%S` + #mv var/build.log ./bundle-fail-linux.log.`date +%Y%m%d%H%M%S` exit 1 fi

diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 7152d7c..bd3ecac 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -87,7 +87,7 @@ then ./bin/gbuild -j $NUM_PROCS --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/mac/gitian-tor.yml if [ $? -ne 0 ]; then - mv var/build.log ./tor-fail-mac.log.`date +%Y%m%d%H%M%S` + #mv var/build.log ./tor-fail-mac.log.`date +%Y%m%d%H%M%S` exit 1 fi

@@ -108,7 +108,7 @@ then ./bin/gbuild -j $NUM_PROCS --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/mac/gitian-firefox.yml if [ $? -ne 0 ]; then - mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S` + #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S` exit 1 fi

@@ -133,7 +133,7 @@ then ./bin/gbuild -j $NUM_PROCS --commit https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG $DESCRIPTOR_DIR/mac/gitian-bundle.yml if [ $? -ne 0 ]; then - mv var/build.log ./bundle-fail-mac.log.`date +%Y%m%d%H%M%S` + #mv var/build.log ./bundle-fail-mac.log.`date +%Y%m%d%H%M%S` exit 1 fi

diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 1c4ac2d..0315c9d 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -87,7 +87,7 @@ then ./bin/gbuild -j $NUM_PROCS --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/windows/gitian-tor.yml if [ $? -ne 0 ]; then - mv var/build.log ./tor-fail-win32.log.`date +%Y%m%d%H%M%S` + #mv var/build.log ./tor-fail-win32.log.`date +%Y%m%d%H%M%S` exit 1 fi

@@ -108,7 +108,7 @@ then ./bin/gbuild -j $NUM_PROCS --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/windows/gitian-firefox.yml if [ $? -ne 0 ]; then - mv var/build.log ./firefox-fail-win32.log.`date +%Y%m%d%H%M%S` + #mv var/build.log ./firefox-fail-win32.log.`date +%Y%m%d%H%M%S` exit 1 fi

@@ -132,7 +132,7 @@ then ./bin/gbuild -j $NUM_PROCS --commit https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG,tbb-windows-installer=$NSIS_TAG $DESCRIPTOR_DIR/windows/gitian-bundle.yml if [ $? -ne 0 ]; then - mv var/build.log ./bundle-fail-win32.log.`date +%Y%m%d%H%M%S` + #mv var/build.log ./bundle-fail-win32.log.`date +%Y%m%d%H%M%S` exit 1 fi