Fixing bug when dealing with trysched and same commits
This commit is contained in:
parent
292f91f751
commit
f4466cba55
2 changed files with 4 additions and 2 deletions
|
@ -34,7 +34,9 @@ def create_copy_command (props):
|
||||||
from_path = os.path.join (get_web_base (), builder, commit[:2], commit, 'gdb.sum.xz')
|
from_path = os.path.join (get_web_base (), builder, commit[:2], commit, 'gdb.sum.xz')
|
||||||
|
|
||||||
if not os.path.exists (from_path):
|
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':
|
if istry and istry == 'yes':
|
||||||
to_path = os.path.join (get_web_base (), builder, 'try', rev[:2], rev)
|
to_path = os.path.join (get_web_base (), builder, 'try', rev[:2], rev)
|
||||||
|
|
|
@ -86,7 +86,7 @@ if test "$IS_TRY_SCHED" = "yes" ; then
|
||||||
ISTRY=1
|
ISTRY=1
|
||||||
fi
|
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 test -n "$CDIR_EXISTS" ; then
|
||||||
# If this is a try build, the user is doing a rebuild.
|
# If this is a try build, the user is doing a rebuild.
|
||||||
# If this is a normal build, someone triggered a rebuild.
|
# If this is a normal build, someone triggered a rebuild.
|
||||||
|
|
Loading…
Reference in a new issue