Hello community, here is the log from the commit of package webyast-ntp-ws for openSUSE:Factory checked in at Thu May 19 13:27:41 CEST 2011.
-------- --- webyast-ntp-ws/webyast-ntp-ws.changes 2011-05-02 14:38:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/webyast-ntp-ws/webyast-ntp-ws.changes 2011-05-16 12:36:23.000000000 +0200 @@ -1,0 +2,13 @@ +Mon May 16 10:34:32 UTC 2011 - [email protected] + +- changed licence to the correct name GPL-2.0 +- 0.2.5 + +------------------------------------------------------------------- +Thu May 12 13:06:46 UTC 2011 - [email protected] + +- corrected call of sntp (bnc #685465) + handle sntp calls in different versions +- 0.2.4 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webyast-ntp-ws.spec ++++++ --- /var/tmp/diff_new_pack.2SdpIE/_old 2011-05-19 13:27:26.000000000 +0200 +++ /var/tmp/diff_new_pack.2SdpIE/_new 2011-05-19 13:27:26.000000000 +0200 @@ -27,11 +27,11 @@ Requires: ntp #for YaPI hwclock Requires: util-linux -License: GPLv2 +License: GPL-2.0 Group: Productivity/Networking/Web/Utilities Url: http://en.opensuse.org/Portal:WebYaST AutoReqProv: on -Version: 0.2.3 +Version: 0.2.5 Release: 1 Summary: WebYaST - NTP service Source: www.tar.bz2 @@ -49,7 +49,7 @@ # %package testsuite -License: GPLv2 + Group: Productivity/Networking/Web/Utilities Requires: %{name} = %{version} Requires: webyast-base-ws-testsuite ++++++ NTP.pm ++++++ --- /var/tmp/diff_new_pack.2SdpIE/_old 2011-05-19 13:27:26.000000000 +0200 +++ /var/tmp/diff_new_pack.2SdpIE/_new 2011-05-19 13:27:26.000000000 +0200 @@ -46,7 +46,15 @@ # -P no: do not ask if time difference is too large # -c 3 -d 15: delay 15s, three attempts (bnc#442287) $out = `/usr/sbin/sntp -c 3 -d 15 -r -P no '$server' 2>&1`; - last if ($?==0); + unless ($?==0) { + # try other parameters ( newer version of ntp ) + # -s:Set (step) the time with settimeofday() + # -t 15: delay 15s (bnc#442287) + $out = `/usr/sbin/sntp -t 15 -s '$server' 2>&1`; + last if ($?==0); + } else { + last + } $out = "Error for server $server: $out"; y2warning($out); } ++++++ www.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/models/ntp.rb new/www/app/models/ntp.rb --- old/www/app/models/ntp.rb 2011-04-29 18:23:25.000000000 +0200 +++ new/www/app/models/ntp.rb 2011-05-12 15:22:47.000000000 +0200 @@ -47,7 +47,7 @@ private def self.get_servers_string - ret = `grep "^[:space:]*NETCONFIG_NTP_STATIC_SERVERS" /etc/sysconfig/network/config | sed 's/.*="\\(.*\\)"/\\1/'` # RORSCAN_ITL + ret = `grep "^[[:space:]]*NETCONFIG_NTP_STATIC_SERVERS" /etc/sysconfig/network/config | sed 's/.*="\\(.*\\)"/\\1/'` # RORSCAN_ITL Rails.logger.info "greped server list is #{ret}" ret end ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
