# HG changeset patch
# User Ethan Quach <Ethan.Quach@oracle.com>
# Date 1312931902 25200
# Node ID 6a009cae3466be8afc48c52a185f7932486a1173
# Parent  2f3830b79568c929e55939f792181b85cbb41cce
7077038 CleanupCPIOInstall ICT fails to find RedirectIPSTrans class

diff -r 2f3830b79568 -r 6a009cae3466 usr/src/lib/install_ict/cleanup_cpio_install.py
--- a/usr/src/lib/install_ict/cleanup_cpio_install.py	Tue Aug 09 14:34:48 2011 -0600
+++ b/usr/src/lib/install_ict/cleanup_cpio_install.py	Tue Aug 09 16:18:22 2011 -0700
@@ -30,7 +30,6 @@
 
 import pkg.client.api as api
 import pkg.client.api_errors as api_errors
-import pkg.client.progress as progress
 import solaris_install.ict as ICT
 
 from stat import S_IREAD, S_IRGRP, S_IROTH
@@ -40,7 +39,7 @@
 from solaris_install.transfer.info import Args
 from solaris_install.transfer.info import CPIOSpec
 from solaris_install.transfer.info import IPSSpec
-from solaris_install.transfer.ips import RedirectIPSTrans
+from solaris_install.transfer.ips import InstallCLIProgressTracker
 from solaris_install.transfer.info import Software
 
 
@@ -207,7 +206,7 @@
             try:
                 api_inst = api.ImageInterface(self.target_dir,
                                PKG5_API_VERSION,
-                               progress.CommandLineProgressTracker(),
+                               InstallCLIProgressTracker(self.logger),
                                None,
                                ICT.PKG_CLIENT_NAME)
 
@@ -278,21 +277,10 @@
                         pkg_rval = api_inst.plan_uninstall(
                             pkg_rm_node.contents)
 
-                # Redirect stdout and stderr from the pkg image in order
-                # to capture the command line output from the pkg
-                # progress tracker into the transfer logs.
                 if pkg_rval:
-                    tmp_stdout = sys.stdout
-                    tmp_stderr = sys.stderr
-                    sys.stdout = sys.stderr = RedirectIPSTrans(self.logger)
-
                     api_inst.prepare()
                     api_inst.execute_plan()
                     api_inst.reset()
-
-                    # Release stdout and stderr
-                    sys.stdout = tmp_stdout
-                    sys.stderr = tmp_stderr
                 else:
                     self.logger.debug('Unable to uninstall install specific '
                                       'packages')