diff options
| author | Kali Kaneko <kali@leap.se> | 2017-12-08 17:53:08 +0100 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2017-12-08 18:12:02 +0100 |
| commit | 13af5d9f4abc6a0dd5aef91e076ed2bb90779d4f (patch) | |
| tree | 6d05b98e27944bc17b52f06fa35dda02949eaf2c | |
| parent | 795f050ae24d8cba0040407957b2631d4a01bdd4 (diff) | |
[pkg] copy provider certificates on bundles
| -rw-r--r-- | pkg/bundles/build.mk | 3 | ||||
| -rw-r--r-- | src/leap/bitmask/bonafide/config.py | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkg/bundles/build.mk b/pkg/bundles/build.mk index b32cfcc0..0def86e4 100644 --- a/pkg/bundles/build.mk +++ b/pkg/bundles/build.mk @@ -25,6 +25,9 @@ bundle: bundle_clean cd pkg/launcher && make cp release-notes.rst $(DIST_VERSION) cp pkg/launcher/bitmask $(DIST_VERSION) + # provider pinning + mkdir -p $(DIST_VERSION)/apps/providers + cp -r src/leap/bitmask/bonafide/providers/* $(DIST_VERSION)/apps/providers/ bundle_linux_gpg: # TODO build it in a docker container! diff --git a/src/leap/bitmask/bonafide/config.py b/src/leap/bitmask/bonafide/config.py index 53a2b2a3..286ec2ac 100644 --- a/src/leap/bitmask/bonafide/config.py +++ b/src/leap/bitmask/bonafide/config.py @@ -162,7 +162,6 @@ def get_pinned_path(domain=None, extension='.json'): filename = domain.encode(sys.getfilesystemencoding()) + extension if STANDALONE: - # TODO: do the bundling part return os.path.join(here(), "..", "apps", "providers", filename) return pkg_resources.resource_filename( |