Author: kmachalkova Date: Thu Apr 3 17:00:38 2008 New Revision: 46044 URL: http://svn.opensuse.org/viewcvs/yast?rev=46044&view=rev Log: xntp has been obsoleted by ntp (#372417) Modified: trunk/ntp-client/src/NtpClient.ycp trunk/ntp-client/src/dialogs.ycp trunk/ntp-client/src/helps.ycp trunk/ntp-client/src/ntp-client_proposal.ycp Modified: trunk/ntp-client/src/NtpClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/NtpClient.ycp?rev=46044&r1=46043&r2=46044&view=diff ============================================================================== --- trunk/ntp-client/src/NtpClient.ycp (original) +++ trunk/ntp-client/src/NtpClient.ycp Thu Apr 3 17:00:38 2008 @@ -22,6 +22,7 @@ import "Mode"; import "NetworkInterfaces"; import "PackageSystem"; +import "Popup"; import "Progress"; import "Report"; import "Service"; @@ -106,7 +107,7 @@ /** * Required packages */ -global list required_packages = ["xntp"]; +global list required_packages = ["ntp"]; /** * ports in firewall to open @@ -443,7 +444,7 @@ boolean failed = false; if (! Mode::testsuite () && ! Mode::installation () - && ! PackageSystem::CheckAndInstallPackagesInteractive (["xntp"]) + && ! PackageSystem::CheckAndInstallPackagesInteractive (["ntp"]) ) { return false; @@ -1000,7 +1001,7 @@ if (ok) { // message report - result of test of connection to NTP server - Report::Message (_("Server is reachable and responds properly.")); + Popup::Notify (_("Server is reachable and responds properly.")); } else { Modified: trunk/ntp-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/dialogs.ycp?rev=46044&r1=46043&r2=46044&view=diff ============================================================================== --- trunk/ntp-client/src/dialogs.ycp (original) +++ trunk/ntp-client/src/dialogs.ycp Thu Apr 3 17:00:38 2008 @@ -75,6 +75,7 @@ Wizard::RestoreHelp(HELPS["write"]:""); NtpClient::AbortFunction = PollAbort; boolean ret = NtpClient::Write(); + NtpClient::AbortFunction = nil; return ret ? `next : `abort; } Modified: trunk/ntp-client/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/helps.ycp?rev=46044&r1=46043&r2=46044&view=diff ============================================================================== --- trunk/ntp-client/src/helps.ycp (original) +++ trunk/ntp-client/src/helps.ycp Thu Apr 3 17:00:38 2008 @@ -143,7 +143,7 @@ "options" : _("<p><b><big>Options</big></b><br> To fine tune the synchronization source, write the options to the <b>Options</b> text field. For details, see -<i>/usr/share/doc/packages/xntp-doc/confopt.htm</i>.</p>"), +<i>/usr/share/doc/packages/ntp-doc/confopt.htm</i>.</p>"), "restrict" : _("<p><b><big>Access Control Options</big></b><br> Here you can define access control flags (<b><i>restrict</i></b> directive in @@ -228,8 +228,8 @@ + // help text 2/2 _("For information about the meaning of the options, install package -<i>xntp-doc</i> and see -<i>/usr/share/doc/packages/xntp-doc/html/refclock.htm</i></p>"); +<i>ntp-doc</i> and see +<i>/usr/share/doc/packages/ntp-doc/html/refclock.htm</i></p>"); } /* EOF */ Modified: trunk/ntp-client/src/ntp-client_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/ntp-client_proposal.ycp?rev=46044&r1=46043&r2=46044&view=diff ============================================================================== --- trunk/ntp-client/src/ntp-client_proposal.ycp (original) +++ trunk/ntp-client/src/ntp-client_proposal.ycp Thu Apr 3 17:00:38 2008 @@ -113,13 +113,13 @@ UI::ChangeWidget(`id(`ntp_content), `Enabled, false); } - //OK, let's remove this, xntp package is available even on 1CD media so we don't need + //OK, let's remove this, ntp package is available even on 1CD media so we don't need //to check if it is available to prevent repository scanning windows from popping up //(#327336, c#21) - //if ( ( Stage::initial() || !Package::Installed("xntp") ) && !Package::Available("xntp") ) + //if ( ( Stage::initial() || !Package::Installed("ntp") ) && !Package::Available("ntp") ) //{ - // y2warning("xntp package is not installable, NTP synchronization will not be available"); + // y2warning("ntp package is not installable, NTP synchronization will not be available"); // UI::ChangeWidget(`id(`ntp_content), `Enabled, false); //} } @@ -154,7 +154,7 @@ ret = `invalid_hostname; else { - string required_package = "xntp"; + string required_package = "ntp"; //In 1st stage, schedule packages for installation //but not in case user wants to set the time only (F#302917) @@ -222,7 +222,7 @@ //ntp-client_finish will do the job //In installed system we must write the settings - if ( !Stage::initial() && write_settings) + if ( !Stage::initial() /*&& write_settings*/) NtpClient::Write(); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org