From f5d571cade2c25a3c92a0e8b5b4d0350a21b5d01 Mon Sep 17 00:00:00 2001 From: David Strauss Date: Thu, 5 Nov 2009 09:20:11 +0000 Subject: Bzr: Fix hang on second and susequent calls. git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5539 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Plugins/Bzr.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/Server/Plugins/Bzr.py b/src/lib/Server/Plugins/Bzr.py index 021cf3ab1..c0bfef64f 100644 --- a/src/lib/Server/Plugins/Bzr.py +++ b/src/lib/Server/Plugins/Bzr.py @@ -34,8 +34,8 @@ class Bzr(Bcfg2.Server.Plugin.Plugin, try: data = Popen(("env LC_ALL=C bzr revno %s" % (self.datastore)), shell=True, - stdout=PIPE).stdout.readlines() - revision = data[0].rstrip('\n') + stdout=PIPE).communicate()[0].split('\n') + revision = data[0] except IndexError: logger.error("Failed to read bzr revno; disabling Bazaar support") logger.error('''Ran command "bzr revno %s"''' % \ -- cgit v1.2.3-1-g7c22