Author: mvidner
Date: Mon Jan 19 14:22:32 2009
New Revision: 54755
URL: http://svn.opensuse.org/viewcvs/yast?rev=54755&view=rev
Log:
- Removed a server reported nonfunctional (bnc#458917).
- Offer CC.pool.ntp.org for countries that do not have any other
server (bnc#458917 c4).
svn merge -r 54498:54502 http://svn.opensuse.org/svn/yast/branches/SuSE-Code-11-Branch/ntp-client
Modified:
trunk/ntp-client/ (props changed)
trunk/ntp-client/VERSION
trunk/ntp-client/agents/etc_ntp.scr
trunk/ntp-client/data/ntp_servers.ycp
trunk/ntp-client/package/yast2-ntp-client.changes
trunk/ntp-client/src/NtpClient.ycp
Modified: trunk/ntp-client/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/VERSION?rev=54755&r1=54754&r2=54755&view=diff
==============================================================================
--- trunk/ntp-client/VERSION (original)
+++ trunk/ntp-client/VERSION Mon Jan 19 14:22:32 2009
@@ -1 +1 @@
-2.17.10
+2.17.11
Modified: trunk/ntp-client/agents/etc_ntp.scr
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/agents/etc_ntp.scr?rev=54755&r1=54754&r2=54755&view=diff
==============================================================================
--- trunk/ntp-client/agents/etc_ntp.scr (original)
+++ trunk/ntp-client/agents/etc_ntp.scr Mon Jan 19 14:22:32 2009
@@ -1,6 +1,6 @@
/**
- * File: etc_cups_printers.scr
- * Summary: Agent for reading /etc/cups/printers.conf file
+ * File: etc_ntp.scr
+ * Summary: Agent for reading /etc/ntp.conf file
* Author: Jiri Srain
* Access: read
*
Modified: trunk/ntp-client/data/ntp_servers.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/data/ntp_servers.ycp?rev=54755&r1=54754&r2=54755&view=diff
==============================================================================
--- trunk/ntp-client/data/ntp_servers.ycp (original)
+++ trunk/ntp-client/data/ntp_servers.ycp Mon Jan 19 14:22:32 2009
@@ -351,14 +351,6 @@
"synchronization" : "NTP secondary (stratum 2), Linux 2 on Intel PIII 500MHz",
],
$[
- "address" : "ntp.ewha.net",
- "coordinates" : "37:24:45.3N 127:07:28.5E (WGS 84)",
- "country" : "KR",
- "exact_location" : "KT-IDC, Bundang, Korea",
- "stratum" : "2",
- "synchronization" : "NTP V3 (stratum 2), i586/Linux",
- ],
- $[
"access_policy" : "open access",
"address" : "ntp.doubleukay.com",
"country" : "MY",
Modified: trunk/ntp-client/package/yast2-ntp-client.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/package/yast2-ntp-client.changes?rev=54755&r1=54754&r2=54755&view=diff
==============================================================================
--- trunk/ntp-client/package/yast2-ntp-client.changes (original)
+++ trunk/ntp-client/package/yast2-ntp-client.changes Mon Jan 19 14:22:32 2009
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Fri Jan 9 14:10:47 CET 2009 - mvidner@suse.cz
+
+- Removed a server reported nonfunctional (bnc#458917).
+- Offer CC.pool.ntp.org for countries that do not have any other
+ server (bnc#458917 c4).
+- 2.17.11
+
+-------------------------------------------------------------------
Fri Dec 12 16:00:50 CET 2008 - mvidner@suse.cz
- Due to yesterday's change, the Configure button at install time
Modified: trunk/ntp-client/src/NtpClient.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/NtpClient.ycp?rev=54755&r1=54754&r2=54755&view=diff
==============================================================================
--- trunk/ntp-client/src/NtpClient.ycp (original)
+++ trunk/ntp-client/src/NtpClient.ycp Mon Jan 19 14:22:32 2009
@@ -116,7 +116,11 @@
/**
* List of known NTP servers
- * server -> information
+ * server address -> information
+ * address: the key repeated
+ * country: CC (uppercase)
+ * location: for displaying
+ * ...: (others are unused)
*/
map > ntp_servers = nil;
@@ -196,6 +200,14 @@
return Language::GetGivenLanguageCountry( lang );
}
+map MakePoolRecord (string CC, string location) {
+ return $[
+ "address" : tolower(CC) + ".pool.ntp.org",
+ "country" : CC,
+ "location": location,
+ ];
+}
+
/**
* Get the list of known NTP servers
* @return a list of known NTP servers
@@ -218,13 +230,10 @@
return $[ server : s ];
});
}
-
foreach (string short_country, string country_name, GetAllKnownCountries(), {
- ntp_servers[tolower(short_country) + ".pool.ntp.org"] = $[
- "address" : tolower(short_country) + ".pool.ntp.org",
- "country" : short_country,
- "location": country_name,
- ];
+ // just refactored existing code
+ map p = MakePoolRecord(short_country, country_name);
+ ntp_servers[p["address"]:""] = p;
});
}
@@ -263,6 +272,9 @@
servers = filter (string s, map o, servers, {
return o["country"]:"" == country;
});
+ // bnc#458917 add country, in case data/country.ycp does not have it
+ map p = MakePoolRecord (country, "");
+ servers[p["address"]:""] = p;
}
else
{
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
