Update hashes for bitmask-root and openvpn
authorTomás Touceda <chiiph@leap.se>
Fri, 20 Jun 2014 16:39:32 +0000 (13:39 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 20 Jun 2014 16:39:32 +0000 (13:39 -0300)
bundler/actions.py
bundler/main.py

index 2178597..df96c92 100644 (file)
@@ -159,7 +159,7 @@ class PythonSetupAll(Action):
         Action.__init__(self, "pythonsetup", basedir, skip, do)
 
     @skippable
-    def run(self, sorted_repos):
+    def run(self, sorted_repos, binaries_path):
         cd(self._basedir)
         for repo in sorted_repos:
             print "Setting up", repo
@@ -187,6 +187,12 @@ class PythonSetupAll(Action):
                         make()
                         print "Running build to get correct version..."
                         python("setup.py", "build")
+                        print "Updating hashes"
+                        os.environ["OPENVPN_BIN"] = os.path.join(
+                            binaries_path, "openvpn.files", "leap-openvpn")
+                        os.environ["BITMASK_ROOT"] = os.path.join(
+                            self._basedir, repo, "pkg", "linux", "bitmask-root")
+                        python("setup.py", "hash_binaries")
                     python("setup.py", "develop")
                     sys.path.append(os.path.join(self._basedir, repo, "src"))
 
index 5590e01..e26537a 100644 (file)
@@ -77,7 +77,7 @@ def main():
         gc.run(sorted_repos, args.nightly)
 
         ps = init(PythonSetupAll)
-        ps.run(sorted_repos)
+        ps.run(sorted_repos, binaries_path)
 
         cd = init(CreateDirStructure, os.path.join(bd, "Bitmask"))
         cd.run()