Hello community, here is the log from the commit of package yast2-core for openSUSE:Factory checked in at Tue Apr 21 14:46:01 CEST 2009. -------- --- yast2-core/yast2-core.changes 2009-04-21 13:03:27.000000000 +0200 +++ yast2-core/yast2-core.changes 2009-04-21 14:40:48.133131000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 21 14:40:31 CEST 2009 - coolo@suse.de + +- avoid y2log in both signal handler and forked children (bnc#493152) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-core.spec ++++++ --- /var/tmp/diff_new_pack.e14802/_old 2009-04-21 14:43:45.000000000 +0200 +++ /var/tmp/diff_new_pack.e14802/_new 2009-04-21 14:43:45.000000000 +0200 @@ -20,7 +20,7 @@ Name: yast2-core Version: 2.18.6 -Release: 3 +Release: 4 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -194,6 +194,8 @@ %changelog * Tue Apr 21 2009 coolo@suse.de +- avoid y2log in both signal handler and forked children (bnc#493152) +* Tue Apr 21 2009 coolo@suse.de - another hot fix * Mon Apr 20 2009 coolo@suse.de - trying hot fix for bnc#493152 ++++++ nologinsignalhandler.diff ++++++ --- /var/tmp/diff_new_pack.e14802/_old 2009-04-21 14:43:45.000000000 +0200 +++ /var/tmp/diff_new_pack.e14802/_new 2009-04-21 14:43:45.000000000 +0200 @@ -1,22 +1,38 @@ ---- yast2-core-2.18.6/liby2/src/genericfrontend.cc -+++ yast2-core-2.18.6/liby2/src/genericfrontend.cc -@@ -210,12 +210,6 @@ void - signal_handler (int sig) - { - signal (sig, SIG_IGN); -- fprintf (stderr, "YaST got signal %d at YCP file %s:%d\n", -- sig, ee.filename ().c_str (), ee.linenumber ()); -- y2error ("got signal %d at YCP file %s:%d", -- sig, ee.filename ().c_str (), ee.linenumber ()); -- log_stored_debug (); -- log_backtrace (); - // bye - signal (sig, SIG_DFL); - kill ( getpid (), sig); -Index: src/y2log.cc +Index: core/agent-system/src/ShellCommand.cc =================================================================== ---- p1/src/y2log.cc (Revision 56785) -+++ p1/src/y2log.cc (Arbeitskopie) +--- core/agent-system/src/ShellCommand.cc (Revision 56785) ++++ core/agent-system/src/ShellCommand.cc (Arbeitskopie) +@@ -117,7 +117,7 @@ + FILE *stream2 = fdopen (pipe2[0], "r"); + if (stream2 == 0) + { +- y2error ("stream2 fdopen error"); ++ y2error ("stream2 fdopen error"); + _exit (1); + } + close (pipe2[1]); +@@ -126,7 +126,7 @@ + { + if (out) + fputs (s2, out); +- y2debug ("%s", s2); ++ //y2debug ("%s", s2); + } + + fclose (stream2); +@@ -154,7 +154,7 @@ + else + ret = WTERMSIG (ret) + 128; + +- y2debug ("Exit status is %d", ret); ++ //y2debug ("Exit status is %d", ret); + + if (!tempdir.empty ()) + { +Index: core/liby2util-r/src/y2log.cc +=================================================================== +--- core/liby2util-r/src/y2log.cc (Revision 56785) ++++ core/liby2util-r/src/y2log.cc (Arbeitskopie) @@ -119,7 +119,9 @@ FILE * newstderr = fdopen( dupstderr, "a" ); @@ -75,3 +91,52 @@ snprintf (date, sizeof (date), "%s.%03ld", tmp1, time.tv_usec / 1000); #endif +Index: core/liby2/src/Y2ProgramComponent.cc +=================================================================== +--- core/liby2/src/Y2ProgramComponent.cc (Revision 56785) ++++ core/liby2/src/Y2ProgramComponent.cc (Arbeitskopie) +@@ -291,13 +291,13 @@ + + // Call chroot if desired. + if (chroot_path == "" || chroot_path == "/") { +- y2debug ("Going to execute %s", bin_file.c_str ()); ++ //y2debug ("Going to execute %s", bin_file.c_str ()); + } else { +- y2debug ("Going to execute %s with chroot %s", bin_file.c_str (), +- chroot_path.c_str ()); ++ /*y2debug ("Going to execute %s with chroot %s", bin_file.c_str (), ++ chroot_path.c_str ());*/ + if (chroot (chroot_path.c_str ()) != 0) { +- y2error ("Cannot chroot to %s: %s", chroot_path.c_str (), +- strerror (errno)); ++ /*y2error ("Cannot chroot to %s: %s", chroot_path.c_str (), ++ strerror (errno));*/ + _exit (5); + } + +@@ -307,7 +307,7 @@ + execv (bin_file.c_str (), argv); // execute program + + // this code is only reached if exec failed +- y2error ("Cannot execute external program %s", bin_file.c_str ()); ++ //y2error ("Cannot execute external program %s", bin_file.c_str ()); + _exit (5); // No sense in returning! I am forked away!! + } + +Index: core/liby2/src/genericfrontend.cc +=================================================================== +--- core/liby2/src/genericfrontend.cc (Revision 56785) ++++ core/liby2/src/genericfrontend.cc (Arbeitskopie) +@@ -210,12 +210,6 @@ + signal_handler (int sig) + { + signal (sig, SIG_IGN); +- fprintf (stderr, "YaST got signal %d at YCP file %s:%d\n", +- sig, ee.filename ().c_str (), ee.linenumber ()); +- y2error ("got signal %d at YCP file %s:%d", +- sig, ee.filename ().c_str (), ee.linenumber ()); +- log_stored_debug (); +- log_backtrace (); + // bye + signal (sig, SIG_DFL); + kill ( getpid (), sig); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org