adapted config.py to new contrib directory

mailpile · Jan 5, 2016 · 48fd19c · 48fd19c
1 parent 09be3b1
commit 48fd19c
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/mailpile/config.py b/mailpile/config.py
@@ -1246,7 +1246,7 @@ def DEFAULT_SHARED_DATADIR(self):
 
     def __init__(self, workdir=None, shareddatadir=None, rules={}):
         ConfigDict.__init__(self, _rules=rules, _magic=False)
- 
+
         self.workdir = os.path.abspath(workdir or self.DEFAULT_WORKDIR())
         mailpile.vfs.register_alias('/Mailpile', self.workdir)
 
@@ -1453,8 +1453,7 @@ def _unlocked_load(self, session, filename=None, public=False):
         # Discover plugins and update the config rule to match
         from mailpile.plugins import PluginManager
         self.plugins = PluginManager(config=self, builtin=True).discover([
-            os.path.join(os.path.dirname(os.path.realpath(__file__)),
-                         'contrib'),
+            os.path.join(self.shareddatadir, 'contrib'),
             os.path.join(self.workdir, 'plugins')
         ])
         self.sys.plugins.rules['_any'][self.RULE_CHECKER