Author: jsuchome Date: Tue Sep 11 21:32:57 2007 New Revision: 40858 URL: http://svn.opensuse.org/viewcvs/yast?rev=40858&view=rev Log: - do not call xset in text mode (#309438) - 2.15.19 Modified: trunk/country/VERSION trunk/country/package/yast2-country.changes trunk/country/timezone/src/Timezone.ycp Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=40858&r1=40857&r2=40858&view=diff ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Tue Sep 11 21:32:57 2007 @@ -1 +1 @@ -2.15.18 +2.15.19 Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.changes?rev=40858&r1=40857&r2=40858&view=diff ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Tue Sep 11 21:32:57 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Sep 11 21:21:01 CEST 2007 - jsuchome@suse.cz + +- do not call xset in text mode (#309438) +- 2.15.19 + +------------------------------------------------------------------- Thu Sep 6 18:29:27 CEST 2007 - kmachalkova@suse.cz - Accept also IP as a valid NTP server address (handle receiving Modified: trunk/country/timezone/src/Timezone.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/Timezone.ycp?rev=40858&r1=40857&r2=40858&view=diff ============================================================================== --- trunk/country/timezone/src/Timezone.ycp (original) +++ trunk/country/timezone/src/Timezone.ycp Tue Sep 11 21:32:57 2007 @@ -163,7 +163,8 @@ // if (!Mode::config () && really ) { - if (Stage::initial () || Stage::cont ()) + boolean textmode = Language::GetTextMode (); + if ((Stage::initial () || Stage::cont ()) && !textmode) SCR::Execute ( .target.bash, "/usr/bin/xset -dpms"); string cmd = "/usr/sbin/zic -l " + timezone; y2milestone( "Set cmd %1", cmd ); @@ -174,7 +175,7 @@ y2milestone( "Set cmd %1", cmd ); y2milestone( "Set ret %1", SCR::Execute(.target.bash_output, cmd )); } - if (Stage::initial () || Stage::cont ()) + if ((Stage::initial () || Stage::cont ()) && !textmode) SCR::Execute ( .target.bash, "/usr/bin/xset +dpms"); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org