summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Touceda <chiiph@riseup.net>2014-09-02 14:56:06 -0400
committerTomás Touceda <chiiph@leap.se>2014-09-02 16:08:01 -0300
commitf802d28a515c8cd60fdcad9fc32d79fbdf866e60 (patch)
treea7f5a07451888a4e843fd90e53e7e09d4831dc03
parent720ca69723566b54b5b6a70654e33a232e8d0747 (diff)
Add root.json to the bundle
-rw-r--r--bundler/actions.py4
-rw-r--r--bundler/main.py2
2 files changed, 4 insertions, 2 deletions
diff --git a/bundler/actions.py b/bundler/actions.py
index 557e8b0..2ab134d 100644
--- a/bundler/actions.py
+++ b/bundler/actions.py
@@ -494,7 +494,7 @@ url_prefix = http://dl.bitmask.net/tuf"""
Action.__init__(self, "copymisc", basedir, skip, do)
@skippable
- def run(self):
+ def run(self, binary_path):
print "Downloading thunderbird extension..."
ext_path = platform_dir(self._basedir, "apps",
"bitmask-thunderbird-latest.xpi")
@@ -533,6 +533,8 @@ url_prefix = http://dl.bitmask.net/tuf"""
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"))
+ cp(os.path.join(binary_path, "root.json"),
+ os.path.join(self._basedir, "Bitmask", "repo", "metadata", "current"))
print "Done"
diff --git a/bundler/main.py b/bundler/main.py
index 1328b3f..326e80b 100644
--- a/bundler/main.py
+++ b/bundler/main.py
@@ -100,7 +100,7 @@ def main():
fd.run()
cm = init(CopyMisc)
- cm.run()
+ cm.run(binaries_path)
pyc = init(PycRemover)
pyc.run()