diff options
| author | Gordon Sim <gsim@apache.org> | 2010-09-22 09:43:41 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2010-09-22 09:43:41 +0000 |
| commit | 3e599c688f22c829c3f27f9b96fd6e17d1c747e2 (patch) | |
| tree | 28e753ffc7ee2e025855adac95d38cd00abd43d9 /qpid/tools | |
| parent | 6d6bdcbadc22531fbc97d8edf4341b0ec9f4b388 (diff) | |
| download | qpid-python-3e599c688f22c829c3f27f9b96fd6e17d1c747e2.tar.gz | |
Fix qpid-cluster-store tool for recent changes to UUID (see r995770)
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@999841 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/tools')
| -rwxr-xr-x | qpid/tools/src/py/qpid-cluster-store | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qpid/tools/src/py/qpid-cluster-store b/qpid/tools/src/py/qpid-cluster-store index 0333b371fd..8cbfa5505b 100755 --- a/qpid/tools/src/py/qpid-cluster-store +++ b/qpid/tools/src/py/qpid-cluster-store @@ -20,7 +20,7 @@ # from qpid.datatypes import uuid4, UUID, parseUUID -import optparse, os.path, sys +import optparse, os.path, sys, string op = optparse.OptionParser( usage="usage: %prog [options] DATADIR", @@ -31,7 +31,7 @@ op.add_option("-c", "--mark-clean", default=False, action="store_true", help="ma class ClusterStoreStatus: """Load/save/display store status file""" - null_uuid=UUID('\0'*16) + null_uuid=UUID(bytes='\0'*16) def __init__(self, file): self.file = file @@ -39,7 +39,7 @@ class ClusterStoreStatus: def read(self): f = open(self.file) - try: self.cluster_id, self.shutdown_id = [parseUUID(s) for s in f.readlines()] + try: self.cluster_id, self.shutdown_id = [parseUUID(string.rstrip(s)) for s in f.readlines()] finally: f.close() def write(self): |