[sabayon] Don't eat sabayon-apply's stderr output, either...



commit 09719e99cc84d5b8a971403d3da3d3b11c8a004e
Author: Federico Mena Quintero <federico novell com>
Date:   Mon Aug 17 15:06:02 2009 -0500

    Don't eat sabayon-apply's stderr output, either...
    
    ... until we know how to do this properly without blocking the sabayon-apply child process.
    
    Signed-off-by: Federico Mena Quintero <federico novell com>

 lib/protosession.py |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/lib/protosession.py b/lib/protosession.py
index 98907cd..8133131 100644
--- a/lib/protosession.py
+++ b/lib/protosession.py
@@ -480,7 +480,7 @@ class ProtoSession (gobject.GObject):
 
         try:
             pipe = subprocess.Popen (argv,
-                                     stderr = subprocess.PIPE,
+#                                     stderr = subprocess.PIPE,
                                      env = os.environ)
         except Exception, e:
             raise errors.FatalApplyErrorException (("Could not create the 'sabayon-apply' process: %s\n" +
@@ -491,7 +491,7 @@ class ProtoSession (gobject.GObject):
                                                     e.child_traceback))
 
         return_code = pipe.wait ()
-        stderr_str = pipe.stderr.read ()
+#        stderr_str = pipe.stderr.read ()
 
 #        print "<BEGIN SABAYON-APPLY STDERR>\n%s\n<END SABAYON-APPLY STDERR>" % stderr_str
 
@@ -500,19 +500,19 @@ class ProtoSession (gobject.GObject):
             pass
         elif return_code == util.EXIT_CODE_RECOVERABLE:
             mprint ("Finished running sabayon-apply with RECOVERABLE exit status")
-            mprint ("========== BEGIN SABAYON-APPLY LOG (RECOVERABLE) ==========\n"
-                    "%s\n"
-                    "========== END SABAYON-APPLY LOG (RECOVERABLE) ==========",
-                    stderr_str)
+#            mprint ("========== BEGIN SABAYON-APPLY LOG (RECOVERABLE) ==========\n"
+#                    "%s\n"
+#                    "========== END SABAYON-APPLY LOG (RECOVERABLE) ==========",
+#                    stderr_str)
             raise errors.RecoverableApplyErrorException (_("There was a recoverable error while applying "
                                                            "the user profile from file '%s'.") % self.profile_file)
         else:
             # return_code == util.EXIT_CODE_FATAL or something else
             mprint ("Finished running sabayon-apply with FATAL exit status")
-            mprint ("========== BEGIN SABAYON-APPLY LOG (FATAL) ==========\n"
-                    "%s\n"
-                    "========== END SABAYON-APPLY LOG (FATAL) ==========",
-                    stderr_str)
+#            mprint ("========== BEGIN SABAYON-APPLY LOG (FATAL) ==========\n"
+#                    "%s\n"
+#                    "========== END SABAYON-APPLY LOG (FATAL) ==========",
+#                    stderr_str)
             raise errors.FatalApplyErrorException (_("There was a fatal error while applying the "
                                                      "user profile from '%s'.") % self.profile_file)
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]