diff options
| author | leap <leap@leap64.leap> | 2014-08-07 15:24:45 -0400 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-09-02 15:36:47 -0300 |
| commit | 720ca69723566b54b5b6a70654e33a232e8d0747 (patch) | |
| tree | 4515e823c9b8a72f579e8981d899b3e7954c7f25 /bundler | |
| parent | 7ff0c5524e71e79cd2d041c090551ee1ca2de55d (diff) | |
Remove Thandy for TUF
Diffstat (limited to 'bundler')
| -rw-r--r-- | bundler/actions.py | 16 | ||||
| -rw-r--r-- | bundler/main.py | 1 |
2 files changed, 11 insertions, 6 deletions
diff --git a/bundler/actions.py b/bundler/actions.py index 30c86d3..557e8b0 100644 --- a/bundler/actions.py +++ b/bundler/actions.py @@ -139,7 +139,7 @@ class GitCloneAll(Action): with push_pop(repo): # Thandy is a special case regarding branches, we'll just use # develop - if repo in ["thandy", "leap_assets"]: + if repo in ["leap_assets"]: continue if not nightly: git.checkout("master") @@ -484,6 +484,12 @@ class CopyAssets(Action): class CopyMisc(Action): + TUF_CONFIG="""[General] +updater_delay = 60 + +[Mirror.localhost] +url_prefix = http://dl.bitmask.net/tuf""" + def __init__(self, basedir, skip, do): Action.__init__(self, "copymisc", basedir, skip, do) @@ -504,10 +510,6 @@ class CopyMisc(Action): "launcher.py")), apps_dir) cp("-r", - _convert_path_for_win(os.path.join(self._basedir, "thandy", "lib", - "thandy")), - apps_dir) - cp("-r", _convert_path_for_win(os.path.join(self._basedir, "bitmask_client", "src", "leap")), apps_dir) @@ -527,6 +529,10 @@ class CopyMisc(Action): os.path.join(self._basedir, "bitmask_client", "relnotes.txt")), _convert_path_for_win(os.path.join(self._basedir, "Bitmask"))) + with open(os.path.join(self._basedir, "Bitmask", "launcher.conf"), "w") as f: + f.write(self.TUF_CONFIG) + mkdir("-p", os.path.join(self._basedir, "Bitmask", "repo", "metadata", "current")) + mkdir("-p", os.path.join(self._basedir, "Bitmask", "repo", "metadata", "previous")) print "Done" diff --git a/bundler/main.py b/bundler/main.py index 715225f..1328b3f 100644 --- a/bundler/main.py +++ b/bundler/main.py @@ -26,7 +26,6 @@ sorted_repos = [ "leap_mail", "bitmask_client", "bitmask_launcher", - "thandy" ] |