diff options
| author | Aaron Bentley <aaron.bentley@utoronto.ca> | 2006-04-06 22:17:23 -0400 |
|---|---|---|
| committer | Aaron Bentley <aaron.bentley@utoronto.ca> | 2006-04-06 22:17:23 -0400 |
| commit | d3fbae175f0cf639cfe0957e216cccf9a95e009b (patch) | |
| tree | 3bbc6cd633181d543f47c24406d6b7b58c77350c /libbe | |
| parent | 64794faedd01c04cbb56ccbbe299d515d4edeefe (diff) | |
| parent | e312d44cc6967e18b21955c6d9658d4c04259a92 (diff) | |
| download | bugseverywhere-d3fbae175f0cf639cfe0957e216cccf9a95e009b.tar.gz | |
Merge remaining fixes from Zwart
Diffstat (limited to 'libbe')
| -rw-r--r-- | libbe/bzr.py | 3 | ||||
| -rw-r--r-- | libbe/plugin.py | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/libbe/bzr.py b/libbe/bzr.py index 7aa6a58..b53429c 100644 --- a/libbe/bzr.py +++ b/libbe/bzr.py @@ -121,7 +121,8 @@ def postcommit(directory): try: invoke_client('merge', directory=directory) except CommandError, e: - if 'No merge branch known or specified' in e.err_str: + if ('No merge branch known or specified' in e.err_str or + 'No merge location known or specified' in e.err_str): pass else: status = invoke_client('revert', '--no-backup', diff --git a/libbe/plugin.py b/libbe/plugin.py index b175733..4016ca1 100644 --- a/libbe/plugin.py +++ b/libbe/plugin.py @@ -52,9 +52,7 @@ def get_plugin(prefix, name): return my_import(prefix + "." + name) return None -plugin_path = sys.path[0] -while not os.path.isfile(os.path.join(plugin_path, "libbe/plugin.py")): - plugin_path = os.path.realpath(os.path.dirname(plugin_path)) +plugin_path = os.path.realpath(os.path.dirname(os.path.dirname(__file__))) if plugin_path not in sys.path: sys.path.append(plugin_path) def _test(): |