Author: mvidner Date: Wed Mar 10 16:28:39 2010 New Revision: 61235 URL: http://svn.opensuse.org/viewcvs/yast?rev=61235&view=rev Log: Mode::test(): check getenv instead of the UI so that it works also in WebYaST (bnc#243624#c13). svn merge -c61234 http://svn.opensuse.org/svn/yast/branches/SuSE-Code-11-SP1-Branch/yast2 (actually by --ignore-ancestry and --record only. and it deleted lotsa useless mergeinfos too!) Modified: branches/SuSE-Linux-11_2-Branch/yast2/ (props changed) branches/SuSE-Linux-11_2-Branch/yast2/VERSION branches/SuSE-Linux-11_2-Branch/yast2/library/agents/ag_freespace (props changed) branches/SuSE-Linux-11_2-Branch/yast2/library/agents/etc_ssh_sshd_config.scr (props changed) branches/SuSE-Linux-11_2-Branch/yast2/library/agents/proc_mounts.scr (props changed) branches/SuSE-Linux-11_2-Branch/yast2/library/agents/system_freespace.scr (props changed) branches/SuSE-Linux-11_2-Branch/yast2/library/control/src/InstError.ycp (props changed) branches/SuSE-Linux-11_2-Branch/yast2/library/control/src/InstExtensionImage.ycp (props changed) branches/SuSE-Linux-11_2-Branch/yast2/library/modules/ConfigHistory.ycp (props changed) branches/SuSE-Linux-11_2-Branch/yast2/library/modules/Mode.ycp branches/SuSE-Linux-11_2-Branch/yast2/library/network/agents/network.scr.in (props changed) branches/SuSE-Linux-11_2-Branch/yast2/library/network/agents/sysconfig_SuSEfirewall2.scr (props changed) branches/SuSE-Linux-11_2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces.err (props changed) branches/SuSE-Linux-11_2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces.out (props changed) branches/SuSE-Linux-11_2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces.ycp (props changed) branches/SuSE-Linux-11_2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces2.err (props changed) branches/SuSE-Linux-11_2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces2.out (props changed) branches/SuSE-Linux-11_2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces2.ycp (props changed) branches/SuSE-Linux-11_2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces3.err (props changed) branches/SuSE-Linux-11_2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces3.out (props changed) branches/SuSE-Linux-11_2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces3.ycp (props changed) branches/SuSE-Linux-11_2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces4.err (props changed) branches/SuSE-Linux-11_2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces4.out (props changed) branches/SuSE-Linux-11_2-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces4.ycp (props changed) branches/SuSE-Linux-11_2-Branch/yast2/library/packages/src/PackagesProposal.ycp (props changed) branches/SuSE-Linux-11_2-Branch/yast2/library/packages/src/PackagesUI.ycp (props changed) branches/SuSE-Linux-11_2-Branch/yast2/library/packages/src/SlideShow.ycp (props changed) branches/SuSE-Linux-11_2-Branch/yast2/library/packages/src/Slides.ycp (props changed) branches/SuSE-Linux-11_2-Branch/yast2/package/yast2.changes Modified: branches/SuSE-Linux-11_2-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/yast2/VERSION?rev=61235&r1=61234&r2=61235&view=diff ============================================================================== --- branches/SuSE-Linux-11_2-Branch/yast2/VERSION (original) +++ branches/SuSE-Linux-11_2-Branch/yast2/VERSION Wed Mar 10 16:28:39 2010 @@ -1 +1 @@ -2.18.30 +2.18.31 Modified: branches/SuSE-Linux-11_2-Branch/yast2/library/modules/Mode.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/yast2/library/modules/Mode.ycp?rev=61235&r1=61234&r2=61235&view=diff ============================================================================== --- branches/SuSE-Linux-11_2-Branch/yast2/library/modules/Mode.ycp (original) +++ branches/SuSE-Linux-11_2-Branch/yast2/library/modules/Mode.ycp Wed Mar 10 16:28:39 2010 @@ -132,14 +132,9 @@ if (_test == nil) Initialize (); if (!test_autochecked) { - - // do not call GetDisplayInfo in command line mode (bnc#374259) - if (commandline()) - { - _test = "none"; - } - else if (UI::GetDisplayInfo () == nil) { - _test = "testsuite"; // testsuite runs with a dummy ui. + // bnc#243624#c13: Y2ALLGLOBAL is set by yast2-testsuite/skel/runtest.sh + if (getenv ("Y2MODETEST") != nil || getenv ("Y2ALLGLOBAL") != nil) { + _test = "testsuite"; } test_autochecked = true; } Modified: branches/SuSE-Linux-11_2-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/yast2/package/yast2.changes?rev=61235&r1=61234&r2=61235&view=diff ============================================================================== --- branches/SuSE-Linux-11_2-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Linux-11_2-Branch/yast2/package/yast2.changes Wed Mar 10 16:28:39 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Mar 10 15:43:17 CET 2010 - mvidner@suse.cz + +- Mode::test(): check getenv instead of the UI + so that it works also in WebYaST (bnc#243624#c13). +- 2.18.31 + +------------------------------------------------------------------- Wed Mar 3 23:09:17 CET 2010 - jsuchome@suse.cz - SERVICES.pm: added support for enabling/disabling service -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org