Hello community, here is the log from the commit of package yast2-country checked in at Thu Sep 6 20:55:35 CEST 2007. -------- --- yast2-country/yast2-country.changes 2007-08-31 17:35:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-country/yast2-country.changes 2007-09-06 18:58:52.149259000 +0200 @@ -1,0 +2,6 @@ +Thu Sep 6 18:29:27 CEST 2007 - kmachalkova@suse.cz + +- Accept also IP as a valid NTP server address (handle receiving + `invalid_hostname from ntp-client) (#308265) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.K28593/_old 2007-09-06 20:54:58.000000000 +0200 +++ /var/tmp/diff_new_pack.K28593/_new 2007-09-06 20:54:58.000000000 +0200 @@ -12,7 +12,7 @@ Name: yast2-country Version: 2.15.18 -Release: 10 +Release: 13 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -111,6 +111,9 @@ %{prefix}/share/applications/YaST2/timezone.desktop %changelog +* Thu Sep 06 2007 - kmachalkova@suse.cz +- Accept also IP as a valid NTP server address (handle receiving + `invalid_hostname from ntp-client) (#308265) * Fri Aug 31 2007 - kmachalkova@suse.cz - Timezone dialog adjusted to use new ntp installation clients (FaTE #302192, bugzilla #299238,#299557,#302389) ++++++ yast2-country-2.15.18.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.15.18/timezone/src/dialogs.ycp new/yast2-country-2.15.18/timezone/src/dialogs.ycp --- old/yast2-country-2.15.18/timezone/src/dialogs.ycp 2007-08-31 17:28:14.000000000 +0200 +++ new/yast2-country-2.15.18/timezone/src/dialogs.ycp 2007-09-06 18:22:58.000000000 +0200 @@ -11,7 +11,7 @@ * Summary: * Dialogs for timezone and time configuration. * - * $Id: dialogs.ycp 40656 2007-08-31 15:28:13Z kmachalkova $ + * $Id: dialogs.ycp 40795 2007-09-06 16:22:57Z kmachalkova $ */ { textdomain "country"; @@ -138,6 +138,10 @@ UI::ChangeWidget (`id (`ntp_configure), `Enabled, ntp_used); } + void handle_invalid_hostname( string server ) { + Popup::Error( sformat("Invalid NTP server hostname %1", server) ); + } + term cont = `HBox ( `RadioButtonGroup (`id (`rb), `HCenter (`VBox ( `Left (`VBox ( @@ -181,7 +185,7 @@ ret = UI::UserInput(); y2debug ("UserInput ret:%1", ret ); if (ret == `ntp || ret == `manual) - { + { ntp_used = (ret == `ntp); if (ntp_used && !Stage::initial () && !ntp_installed) { @@ -202,7 +206,15 @@ } if (ret == `ntp_configure) { - if (WFM::CallFunction ("ntp-client_proposal", ["AskUser"]) != `next) + symbol rv = (symbol) WFM::CallFunction ("ntp-client_proposal", ["AskUser"]); + + if( rv == `invalid_hostname) + { + handle_invalid_hostname( (string) UI::QueryWidget(`id(`ntp_server), `Value) ); + ret = `retry; + continue; + } + if (rv != `next) continue; } if (ret == `accept && !ntp_used) @@ -262,7 +274,7 @@ if (rv == `invalid_hostname) { - Popup::Error( sformat("Invalid NTP server hostname %1", server) ); + handle_invalid_hostname( server ); ret = `retry; continue; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org