← Back to team overview

checkbox-dev team mailing list archive

[PATCH 06/13] plainbox:secure:providers: make Provider1.bin_dir customizable

 

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@xxxxxxxxxxxxx>
---
 plainbox/plainbox/impl/secure/providers/v1.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/plainbox/plainbox/impl/secure/providers/v1.py b/plainbox/plainbox/impl/secure/providers/v1.py
index db19bc3..7d6777b 100644
--- a/plainbox/plainbox/impl/secure/providers/v1.py
+++ b/plainbox/plainbox/impl/secure/providers/v1.py
@@ -135,7 +135,8 @@ class Provider1(IProvider1, IProviderBackend1):
     """
 
     def __init__(self, base_dir, name, version, description, secure,
-                 gettext_domain=None, locale_dir=None, data_dir=None):
+                 gettext_domain=None, locale_dir=None, data_dir=None,
+                 bin_dir=None):
         """
         Initialize the provider with the associated base directory.
 
@@ -147,6 +148,7 @@ class Provider1(IProvider1, IProviderBackend1):
         self._base_dir = base_dir
         self._locale_dir = locale_dir
         self._data_dir = data_dir
+        self._bin_dir = bin_dir
         self._name = name
         self._version = version
         self._description = description
@@ -209,7 +211,10 @@ class Provider1(IProvider1, IProviderBackend1):
             The programs in that directory may not work without setting
             PYTHONPATH and CHECKBOX_SHARE.
         """
-        return os.path.join(self._base_dir, "bin")
+        if self._bin_dir is not None:
+            return self._bin_dir
+        else:
+            return os.path.join(self._base_dir, "bin")
 
     @property
     def whitelists_dir(self):
-- 
1.9.0



References