1 files changed, 8 insertions, 1 deletions
diff --git a/qpid/python/commands/qpid-tool b/qpid/python/commands/qpid-tool
index 1aee3a1b7f..9977db3518 100755
--- a/qpid/python/commands/qpid-tool
+++ b/qpid/python/commands/qpid-tool
@@ -31,16 +31,23 @@ from qpid.peer           import Closed
 
 class Mcli (Cmd):
   """ Management Command Interpreter """
-  prompt = "qpid: "
 
   def __init__ (self, dataObject, dispObject):
     Cmd.__init__ (self)
     self.dataObject = dataObject
     self.dispObject = dispObject
+    self.dataObject.setCli (self)
+    self.prompt = "qpid: "
     
   def emptyline (self):
     pass
 
+  def setPromptMessage (self, p):
+    if p == None:
+      self.prompt = "qpid: "
+    else:
+      self.prompt = "qpid[%s]: " % p
+
   def do_help (self, data):
     print "Management Tool for QPID"
     print