From 02ca2e05a34a055e4559bdf1424080a643731f50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= Date: Fri, 20 Jun 2014 13:39:32 -0300 Subject: Update hashes for bitmask-root and openvpn --- bundler/actions.py | 8 +++++++- bundler/main.py | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/bundler/actions.py b/bundler/actions.py index 2178597..df96c92 100644 --- a/bundler/actions.py +++ b/bundler/actions.py @@ -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")) diff --git a/bundler/main.py b/bundler/main.py index 5590e01..e26537a 100644 --- a/bundler/main.py +++ b/bundler/main.py @@ -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() -- cgit v1.2.3