From 5686645d49063c73d35436192dfc9a160c672301 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 31 Jan 2009 23:37:18 +0100 Subject: Avoid use of etckeeper pre-commit on Trees not on the filesystem. --- etckeeper-bzr/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'etckeeper-bzr/__init__.py') 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") -- cgit v1.2.3