← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/codehosting/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-15 10:01:15 UTC
  • mfrom: (14521 devel)
  • mto: This revision was merged to the branch mainline in revision 14522.
  • Revision ID: jelmer@canonical.com-20111215100115-y6bg928fwdqd16ej
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/codehosting/__init__.py
11
11
__all__ = [
12
12
    'get_bzr_path',
13
13
    'get_BZR_PLUGIN_PATH_for_subprocess',
 
14
    'load_optional_plugin',
14
15
    ]
15
16
 
16
17
 
17
18
import os
18
19
 
19
20
import bzrlib
 
21
from bzrlib import hooks
20
22
from bzrlib.plugin import load_plugins
21
23
 
22
24
from canonical.config import config
59
61
load_plugins([_get_bzr_plugins_path()])
60
62
 
61
63
 
 
64
def load_optional_plugin(plugin_name):
 
65
    """Load the plugin named `plugin_name` from optionalbzrplugins/."""
 
66
    from bzrlib import plugins
 
67
    optional_plugin_dir = os.path.join(config.root, 'bzrplugins/optional')
 
68
    if optional_plugin_dir not in plugins.__path__:
 
69
        plugins.__path__.append(optional_plugin_dir)
 
70
    __import__("bzrlib.plugins.%s" % plugin_name)
 
71
 
 
72
 
62
73
def load_bundled_plugin(plugin_name):
63
74
    """Load a plugin bundled with Bazaar."""
64
75
    from bzrlib.plugin import get_core_plugin_path