diff --git a/sage_patchbot/patchbot.py b/sage_patchbot/patchbot.py index 867f87b..d7e2608 100755 --- a/sage_patchbot/patchbot.py +++ b/sage_patchbot/patchbot.py @@ -1044,7 +1044,6 @@ def test_a_ticket(self, ticket=None): # ------------- pull and apply ------------- pull_from_trac(self.sage_root, ticket['id'], force=True, - use_ccache=self.config['use_ccache'], safe_only=self.config['safe_only']) t.finish("Apply") state = 'applied' diff --git a/sage_patchbot/trac.py b/sage_patchbot/trac.py index c9b720b..70969ab 100644 --- a/sage_patchbot/trac.py +++ b/sage_patchbot/trac.py @@ -295,15 +295,13 @@ def inplace_safe(): def pull_from_trac(sage_root, ticket_id, branch=None, force=None, - use_ccache=False, safe_only=False): """ Create four branches from base and ticket. - If ticket deemed unsafe then clone git repo to temp directory. ?! + If ticket deemed unsafe then clone git repo to temp directory. - Additionally, if ``use_ccache`` then install ccache. Set some global - and environment variables. + Set some global and environment variables. There are four branches at play here: @@ -354,19 +352,11 @@ def pull_from_trac(sage_root, ticket_id, branch=None, force=None, do_or_die("git branch -f patchbot/ticket_upstream remotes/origin/patchbot/ticket_upstream") do_or_die("make configure") do_or_die("./configure") - if use_ccache: - if not os.path.exists('logs'): - os.mkdir('logs') - do_or_die("./sage -i ccache") except Exception as exn: if merge_failure or (not is_safe): raise else: raise ConfigException(exn.message) - finally: - if not is_safe and not safe_only: - if temp_dir and os.path.exists(temp_dir): - shutil.rmtree(temp_dir) # delete temporary dir # ===================