Author: lslezak Date: Tue Apr 21 20:34:06 2009 New Revision: 56902 URL: http://svn.opensuse.org/viewcvs/yast?rev=56902&view=rev Log: - PackageCallbacks.ycp - don't read non existing y2logRPM file (bnc#456446) Modified: branches/tmp/SLE-11-SP1-Stash/yast2/library/packages/src/PackageCallbacks.ycp branches/tmp/SLE-11-SP1-Stash/yast2/package/yast2.changes Modified: branches/tmp/SLE-11-SP1-Stash/yast2/library/packages/src/PackageCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/yast2/library/packages/src/PackageCallbacks.ycp?rev=56902&r1=56901&r2=56902&view=diff ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/yast2/library/packages/src/PackageCallbacks.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/yast2/library/packages/src/PackageCallbacks.ycp Tue Apr 21 20:34:06 2009 @@ -547,11 +547,6 @@ { y2milestone("DonePackage(error: %1, reason: '%2')", error, reason); - string infopath = (string) SCR::Read (.target.tmpdir) + "/rpmlog"; - SCR::Execute (.target.bash, "/usr/bin/tail '" + String::Quote (Installation::destdir) - + Directory::logdir + "/y2logRPM' > " + infopath); - string info = reason + "\n---\n" + (string) SCR::Read (.target.string, [infopath, "-?-"]); - string message = sformat ( _deleting_package ? // error popup during package installation, %1 is the name of the package _("Removal of package %1 failed.") @@ -561,7 +556,7 @@ if (Mode::commandline()) { CommandLine::Print(message); - CommandLine::Print(info); + CommandLine::Print(reason); // ask user in the interactive mode if (CommandLine::Interactive()) @@ -599,7 +594,7 @@ if ( showLongInfo ) { UI::OpenDialog( `opt(`decorated), LayoutPopup (message, button_box, 10, true) ); - UI::ReplaceWidget(`id(`info), `RichText (`opt(`plainText), info) ); + UI::ReplaceWidget(`id(`info), `RichText (`opt(`plainText), reason) ); } else { @@ -616,7 +611,7 @@ showLongInfo = ShowLogInfo (message, button_box); if (showLongInfo) { - UI::ReplaceWidget(`id(`info), `RichText (`opt(`plainText), info) ); + UI::ReplaceWidget(`id(`info), `RichText (`opt(`plainText), reason) ); } else { @@ -645,6 +640,16 @@ // default: ignore } + else + { + // no error, there is additional info (rpm output), see bnc#456446 + y2milestone("Additional RPM otput: %1", reason); + + if (Mode::commandline()) + { + CommandLine::Print(reason); + } + } return "I"; } Modified: branches/tmp/SLE-11-SP1-Stash/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/yast2/package/yast2.changes?rev=56902&r1=56901&r2=56902&view=diff ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/yast2/package/yast2.changes (original) +++ branches/tmp/SLE-11-SP1-Stash/yast2/package/yast2.changes Tue Apr 21 20:34:06 2009 @@ -5,6 +5,12 @@ which indicates an error (bnc#157551) ------------------------------------------------------------------- +Wed Apr 8 11:27:13 CEST 2009 - lslezak@suse.cz + +- PackageCallbacks.ycp - don't read non existing y2logRPM file + (bnc#456446) + +------------------------------------------------------------------- Fri Apr 3 13:26:58 CEST 2009 - lslezak@suse.cz - Do not display "No package source" popup, just log a warning -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org