summaryrefslogtreecommitdiffstats
path: root/src/lib/Server/Plugins/Bzr.py
diff options
context:
space:
mode:
authorDavid Strauss <david@fourkitchens.com>2009-11-05 10:31:57 +0000
committerDavid Strauss <david@fourkitchens.com>2009-11-05 10:31:57 +0000
commit0b5cefd2eb5d48628d7a8da1e592cc9b8dc778a4 (patch)
treee1f80110c381cef9097ac970f77a64818e995ce2 /src/lib/Server/Plugins/Bzr.py
parentf93d59641f6423cf9d09d115e58f3f56d7d13978 (diff)
downloadbcfg2-0b5cefd2eb5d48628d7a8da1e592cc9b8dc778a4.tar.gz
bcfg2-0b5cefd2eb5d48628d7a8da1e592cc9b8dc778a4.tar.bz2
bcfg2-0b5cefd2eb5d48628d7a8da1e592cc9b8dc778a4.zip
Bzr: Use faster method to detect changes in the working tree. Also, look for unknown items.
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5541 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server/Plugins/Bzr.py')
-rw-r--r--src/lib/Server/Plugins/Bzr.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/Server/Plugins/Bzr.py b/src/lib/Server/Plugins/Bzr.py
index 5886ddba9..a4cebe827 100644
--- a/src/lib/Server/Plugins/Bzr.py
+++ b/src/lib/Server/Plugins/Bzr.py
@@ -27,7 +27,7 @@ class Bzr(Bcfg2.Server.Plugin.Plugin,
try:
working_tree = WorkingTree.open(self.datastore)
revision = str(working_tree.branch.revno())
- if working_tree.changes_from(working_tree.basis_tree()).has_changed:
+ if working_tree.has_changes(working_tree.basis_tree()) or working_tree.unknowns():
revision += "+"
except errors.NotBranchError:
logger.error("Failed to read Bazaar branch; disabling Bazaar support")