Author: jdsn Date: Sat Sep 1 09:12:20 2007 New Revision: 40668 URL: http://svn.opensuse.org/viewcvs/yast?rev=40668&view=rev Log: adapted source management changes (#304310) wrapping of detailled error messages (#239570) 2.15.2 Modified: trunk/registration/VERSION trunk/registration/package/yast2-registration.changes trunk/registration/src/clients/inst_suse_register.ycp Modified: trunk/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/VERSION?rev=40668&r1=40667&r2=40668&view=diff ============================================================================== --- trunk/registration/VERSION (original) +++ trunk/registration/VERSION Sat Sep 1 09:12:20 2007 @@ -1 +1 @@ -2.15.1 +2.15.2 Modified: trunk/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-registration.changes?rev=40668&r1=40667&r2=40668&view=diff ============================================================================== --- trunk/registration/package/yast2-registration.changes (original) +++ trunk/registration/package/yast2-registration.changes Sat Sep 1 09:12:20 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Sat Sep 1 08:34:49 CEST 2007 - jdsn@suse.de + +- adapted source management changes (#304310) +- wrapping of detailled error messages (#239570) +- 2.15.2 + +------------------------------------------------------------------- Tue Aug 21 21:42:33 CEST 2007 - jdsn@suse.de - handling sysconfig file with fillup (#300064) Modified: trunk/registration/src/clients/inst_suse_register.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/clients/inst_suse_register.ycp?rev=40668&r1=40667&r2=40668&view=diff ============================================================================== --- trunk/registration/src/clients/inst_suse_register.ycp (original) +++ trunk/registration/src/clients/inst_suse_register.ycp Sat Sep 1 09:12:20 2007 @@ -30,7 +30,6 @@ import "Internet"; import "Register"; import "SourceManager"; - import "PackageSystem"; import "Package"; // no network - no suse_register @@ -282,15 +281,26 @@ /* vv CCC ERROR POPUP vv */ term error_message_details= - `MinSize( 50, 15, `VBox( + `MinSize( 60, 20, `VBox( `Left( `Label( `opt(`boldFont), error_msg ) ), `VSpacing( 0.5 ), - `RichText(`id(`errordetail), `opt(`plainText) , "" ), + `RichText(`id(`errordetail), "" ), `PushButton(`id(`ok), Label::OKButton()) )); /* ^^ END CCC ERROR ^^ */ + /* vv CCC ERROR POPUP PLAINTEXT vv */ + term error_message_details_pt= + `MinSize( 50, 15, `VBox( + `Left( `Label( `opt(`boldFont), error_msg ) ), + `VSpacing( 0.5 ), + `RichText(`id(`errordetail), `opt(`plainText), "" ), + `PushButton(`id(`ok), Label::OKButton()) + )); + /* ^^ END CCC ERROR PLAINTEXT ^^ */ + + /* vv SUCCESS MESSAGE vv */ term nccc_success= @@ -339,8 +349,13 @@ if ( retry == `skip ) configure_status = false; else if (retry == `err_detail) { - UI::OpenDialog(error_message_details); - UI::ChangeWidget( `id(`errordetail), `Value, (string)information_data["stderr"]:"no error message available"); + // switch to plaintext if error output is one or two lines (#239570) + string error_msg_details = (string)information_data["stderr"]:"no error message available"; + if ( contains( [0,1], size(splitstring(error_msg_details,"\n")) ) ) + UI::OpenDialog(error_message_details); + else + UI::OpenDialog(error_message_details_pt); + UI::ChangeWidget( `id(`errordetail), `Value, error_msg_details); UI::UserInput(); UI::CloseDialog(); } @@ -467,8 +482,12 @@ } else { - // check for and install mozilla-xulrunner if needed (#175166) - Package::InstallAllMsg(["mozilla-xulrunner181"], nil); + // check for and install mozilla-xulrunner if needed (#175166), modified due to (#304310) + string required_package = "mozilla-xulrunner181"; + if (!Package::Installed(required_package)) + { + Package::InstallAllMsg([required_package], nil); + } cmd_ok = (integer) SCR::Execute(.target.bash, "test -x /usr/bin/xulrunner") == 0 ? true:false; bcmd = " MOZ_DISABLE_PANGO=1 /usr/bin/xulrunner /usr/share/YaST2/yastbrowser/application.ini -url "; } @@ -543,11 +562,6 @@ /* -------------------------------- PROGRAM LOGIC START ----------------------------------------------------------- */ - // #172665, make sure that the added sources have a safe home - // It also takes care of target for keys, shows busy popup - // (#270899) should be taken care of even during installation - PackageSystem::EnsureSourceInit (); - // #170113, the lock is needed around everything that may end up in ZMD SourceManager::Lock (); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org