summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2010-09-22 09:43:41 +0000
committerGordon Sim <gsim@apache.org>2010-09-22 09:43:41 +0000
commitf928e3c7061f688f2b78a80315ded4a61e3c5a5f (patch)
treef89ca711279290b74e57866f53f2c1ce852e1547
parentb38a087d7af289083163b3f2067e3e69e96c3b66 (diff)
downloadqpid-python-f928e3c7061f688f2b78a80315ded4a61e3c5a5f.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/qpid@999841 13f79535-47bb-0310-9956-ffa450edef68
-rwxr-xr-xtools/src/py/qpid-cluster-store6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/src/py/qpid-cluster-store b/tools/src/py/qpid-cluster-store
index 0333b371fd..8cbfa5505b 100755
--- a/tools/src/py/qpid-cluster-store
+++ b/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):