diff options
| author | David Strauss <david@fourkitchens.com> | 2009-11-05 09:20:11 +0000 |
|---|---|---|
| committer | David Strauss <david@fourkitchens.com> | 2009-11-05 09:20:11 +0000 |
| commit | f5d571cade2c25a3c92a0e8b5b4d0350a21b5d01 (patch) | |
| tree | 83b3e66a66da7e24d12339f8da83317ae00cde30 /src | |
| parent | 20cb6440cab5b691bb8f5a9c76d26fe715c85113 (diff) | |
| download | bcfg2-f5d571cade2c25a3c92a0e8b5b4d0350a21b5d01.tar.gz bcfg2-f5d571cade2c25a3c92a0e8b5b4d0350a21b5d01.tar.bz2 bcfg2-f5d571cade2c25a3c92a0e8b5b4d0350a21b5d01.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Server/Plugins/Bzr.py | 4 |
1 files 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"''' % \ |