summaryrefslogtreecommitdiff
path: root/etckeeper-bzr
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-01-31 23:37:18 +0100
committerJelmer Vernooij <jelmer@samba.org>2009-01-31 23:37:18 +0100
commit5686645d49063c73d35436192dfc9a160c672301 (patch)
tree3e84552cc64a18a426229a36e27dd398178ee7c0 /etckeeper-bzr
parentcc9462f7f8263ef5adfbeff2fb936bb36b504cba (diff)
Avoid use of etckeeper pre-commit on Trees not on the filesystem.
Diffstat (limited to 'etckeeper-bzr')
-rwxr-xr-xetckeeper-bzr/__init__.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/etckeeper-bzr/__init__.py b/etckeeper-bzr/__init__.py
index 54d160d..3cf06db 100755
--- a/etckeeper-bzr/__init__.py
+++ b/etckeeper-bzr/__init__.py
@@ -13,10 +13,11 @@ if not (hasattr(MutableTree, "hooks") and "start_commit" in MutableTree.hooks):
raise "Version of Bazaar installed does not support required hooks."
def etckeeper_startcommit_hook(tree):
- if not os.path.exists(tree.abspath(".etckeeper")):
+ abspath = getattr(tree, "abspath", None)
+ if abspath is None or not os.path.exists(abspath(".etckeeper")):
# Only run the commit hook when this is an etckeeper branch
return
- ret = subprocess.call(["etckeeper", "pre-commit", tree.abspath(".")])
+ ret = subprocess.call(["etckeeper", "pre-commit", abspath(".")])
if ret != 0:
raise BzrError("etckeeper pre-commit failed")