19155 ImageInterface should call set_linked_name() for ProgressTracker updates
authorEdward Pilatowicz <edward.pilatowicz@oracle.com>
Thu, 26 Jan 2012 14:37:36 -0800
changeset 2619 a439e7e6a4d3
parent 2618 516751269848
child 2620 12fff26f76ad
19155 ImageInterface should call set_linked_name() for ProgressTracker updates
src/modules/client/api.py
src/modules/client/progress.py
--- a/src/modules/client/api.py	Tue Jan 24 14:10:25 2012 +0530
+++ b/src/modules/client/api.py	Thu Jan 26 14:37:36 2012 -0800
@@ -470,6 +470,13 @@
         def __set_progresstracker(self, value):
                 self._activity_lock.acquire()
                 self.__progresstracker = value
+
+                # tell the progress tracker about this image's name
+                lin = None
+                if self._img.linked.ischild():
+                        lin = self._img.linked.child_name
+                self.__progresstracker.set_linked_name(lin)
+
                 self._activity_lock.release()
 
         progresstracker = property(lambda self: self.__progresstracker,
--- a/src/modules/client/progress.py	Tue Jan 24 14:10:25 2012 +0530
+++ b/src/modules/client/progress.py	Thu Jan 26 14:37:36 2012 -0800
@@ -907,7 +907,6 @@
                             "current": self.refresh_cur_pub_cnt,
                             "total": self.refresh_pub_cnt,
                             "publisher": self.refresh_cur_pub }
-                        msg = "%s%s" % (self.msg_prefix, msg)
                         self.curstrlen = len(msg)
                         print "%s" % msg,
                         self.needs_cr = True
@@ -926,7 +925,6 @@
                 self.__generic_done()
 
                 msg = _("Creating Plan")
-                msg = "%s%s" % (self.msg_prefix, msg)
 
                 self.curstrlen = len(msg)
                 try:
@@ -948,7 +946,6 @@
                         print self.cr,
                         msg = _("Creating Plan %c") % self.spinner_chars[
                             self.spinner]
-                        msg = "%s%s" % (self.msg_prefix, msg)
 
                         self.curstrlen = len(msg)
                         print "%s" % msg,
@@ -1248,7 +1245,6 @@
                 self.last_print_time = 0
                 try:
                         msg = _("Optimizing Index...")
-                        msg = "%s%s" % (self.msg_prefix, msg)
 
                         print msg
                         sys.stdout.flush()