From f4466cba5546ab6fb88ee4a637db3693b98090d0 Mon Sep 17 00:00:00 2001 From: Sergio Durigan Junior Date: Mon, 19 Dec 2016 22:55:17 -0500 Subject: [PATCH] Fixing bug when dealing with trysched and same commits --- lib/gdbcommand.py | 4 +++- scripts/update-logs.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/gdbcommand.py b/lib/gdbcommand.py index 3b9b073..db3a0fd 100644 --- a/lib/gdbcommand.py +++ b/lib/gdbcommand.py @@ -34,7 +34,9 @@ def create_copy_command (props): from_path = os.path.join (get_web_base (), builder, commit[:2], commit, 'gdb.sum.xz') if not os.path.exists (from_path): - return [ 'false' ] + # Let's just return true here, because we want the build to + # continue. + return [ 'true' ] if istry and istry == 'yes': to_path = os.path.join (get_web_base (), builder, 'try', rev[:2], rev) diff --git a/scripts/update-logs.sh b/scripts/update-logs.sh index 0ce5989..aae2312 100755 --- a/scripts/update-logs.sh +++ b/scripts/update-logs.sh @@ -86,7 +86,7 @@ if test "$IS_TRY_SCHED" = "yes" ; then ISTRY=1 fi -CDIR_EXISTS=`sqlite3 $DB_NAME "SELECT commitid FROM logs WHERE commitid = '${COMMIT}'"` +CDIR_EXISTS=`sqlite3 $DB_NAME "SELECT commitid FROM logs WHERE commitid = '${COMMIT}' AND trysched = $ISTRY"` if test -n "$CDIR_EXISTS" ; then # If this is a try build, the user is doing a rebuild. # If this is a normal build, someone triggered a rebuild.