diff -r d9ec5928759e -r b0209b707fa2 cobalt.py --- a/cobalt.py Thu Oct 30 02:58:26 2014 +0200 +++ b/cobalt.py Thu Oct 30 04:38:24 2014 +0200 @@ -230,8 +230,9 @@ check_repo_exists ('zandronum', 'Torr_Samaho') check_repo_exists ('zandronum-stable', 'Torr_Samaho') check_repo_exists ('zandronum-sandbox', 'crimsondusk') +check_repo_exists ('zandronum-sandbox-stable', 'crimsondusk') -repocheck_timeout = {'zandronum':(time.time()) + 15, 'zandronum-stable':(time.time() + 15), 'zandronum-sandbox':(time.time()) + 15} +repocheck_timeout = {'zandronum':(time.time()) + 15, 'zandronum-stable':(time.time() + 15), 'zandronum-sandbox':(time.time()) + 15, 'zandronum-sandbox-stable':(time.time()) + 15} def get_commit_data (zanrepo, rev, template): return zanrepo.hg_command ('log', '-l', '1', '-r', rev, '--template', template) @@ -292,7 +293,7 @@ global g_clients usestable = repo_name == 'zandronum-stable' - usesandbox = repo_name == 'zandronum-sandbox' + usesandbox = repo_name == 'zandronum-sandbox' or repo_name == 'zandronum-sandbox-stable' repo_owner = 'Torr_Samaho' if not usesandbox else 'crimsondusk' repo_url = 'https://bitbucket.org/%s/%s' % (repo_owner, repo_name) num_commits = 0 @@ -358,11 +359,15 @@ devrepo.hg_command (*pull_args) #fi - # Pull everything into sandbox too + # Pull everything into sandboxes too if not usesandbox: devrepo = hgapi.Repo ('zandronum-sandbox') pull_args.insert (1, '../%s' % repo_name) devrepo.hg_command (*pull_args) + + devrepo = hgapi.Repo ('zandronum-sandbox-stable') + pull_args.insert (1, '../%s' % repo_name) + devrepo.hg_command (*pull_args) #fi except Exception as e: chanlog ('Warning: unable to pull: %s' % `e`) @@ -653,7 +658,7 @@ bt_checklatest() # Check for new commits in the repositories - for n in ['zandronum-stable', 'zandronum', 'zandronum-sandbox']: + for n in ['zandronum-stable', 'zandronum', 'zandronum-sandbox', 'zandronum-sandbox-stable']: process_zan_repo_updates (n) def channel_by_name (self, name): @@ -965,9 +970,9 @@ elif command == 'checkhg': check_admin (sender, ident, host, command) global repocheck_timeout - repocheck_timeout = {'zandronum':0, 'zandronum-stable':0, 'zandronum-sandbox':0} + repocheck_timeout = {'zandronum':0, 'zandronum-stable':0, 'zandronum-sandbox':0, 'zandronum-sandbox-stable':0} - for n in ['zandronum-stable', 'zandronum', 'zandronum-sandbox']: + for n in ['zandronum-stable', 'zandronum', 'zandronum-sandbox', 'zandronum-sandbox-stable']: numcommits = process_zan_repo_updates (n) if numcommits == 0: