Hello community,
here is the log from the commit of package yast2-ntp-client
checked in at Wed Oct 31 16:41:49 CET 2007.
--------
--- yast2-ntp-client/yast2-ntp-client.changes 2007-10-03 19:01:07.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-ntp-client/yast2-ntp-client.changes 2007-10-31 14:14:48.345018000 +0100
@@ -1,0 +2,8 @@
+Wed Oct 31 13:53:04 CET 2007 - kmachalkova@suse.cz
+
+- Prompt for installing xntp package (CheckAndInstallPackages) on
+ running system, do not scan repositories (Package::Available())
+ (#327336)
+- 2.16.1
+
+-------------------------------------------------------------------
Old:
----
yast2-ntp-client-2.16.0.tar.bz2
New:
----
yast2-ntp-client-2.16.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ntp-client.spec ++++++
--- /var/tmp/diff_new_pack.wQ5426/_old 2007-10-31 16:41:20.000000000 +0100
+++ /var/tmp/diff_new_pack.wQ5426/_new 2007-10-31 16:41:20.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ntp-client (Version 2.16.0)
+# spec file for package yast2-ntp-client (Version 2.16.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-ntp-client
-Version: 2.16.0
+Version: 2.16.1
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ntp-client-2.16.0.tar.bz2
+Source0: yast2-ntp-client-2.16.1.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
#SLPAPI.pm
@@ -36,7 +36,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-ntp-client-2.16.0
+%setup -n yast2-ntp-client-2.16.1
%build
%{prefix}/bin/y2tool y2autoconf
@@ -73,6 +73,11 @@
%doc %{prefix}/share/doc/packages/yast2-ntp-client
/usr/share/YaST2/schema/autoyast/rnc/ntpclient.rnc
%changelog
+* Wed Oct 31 2007 - kmachalkova@suse.cz
+- Prompt for installing xntp package (CheckAndInstallPackages) on
+ running system, do not scan repositories (Package::Available())
+ (#327336)
+- 2.16.1
* Wed Oct 03 2007 - kmachalkova@suse.cz
- Added visual progress feedback for running ntpdate in installation
proposal (#328469)
++++++ yast2-ntp-client-2.16.0.tar.bz2 -> yast2-ntp-client-2.16.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.16.0/src/ntp-client_proposal.ycp new/yast2-ntp-client-2.16.1/src/ntp-client_proposal.ycp
--- old/yast2-ntp-client-2.16.0/src/ntp-client_proposal.ycp 2007-10-02 11:19:44.000000000 +0200
+++ new/yast2-ntp-client-2.16.1/src/ntp-client_proposal.ycp 2007-10-31 12:57:29.000000000 +0100
@@ -16,8 +16,10 @@
import "Stage";
import "Package";
import "Packages";
+import "PackageSystem";
import "Pkg";
import "Popup";
+import "Report";
y2milestone("----------------------------------------");
y2milestone("Ntp client proposal started");
@@ -153,8 +155,29 @@
ret = `invalid_hostname;
else
{
- Popup::ShowFeedback("", _("Synchronizing with NTP server..."));
- y2milestone("Running ntpdate to sync with %1", ntp_server);
+ string required_package = "xntp";
+
+ //In 1st stage, schedule packages for installation
+ if (Stage::initial())
+ {
+ if (Package::Available(required_package))
+ {
+ Packages::addAdditionalPackage(required_package);
+ // bugzilla #327050
+ // Agent for writing /etc/ntp.conf needs to be installed
+ // to write the settings at the end of the installation
+ Packages::addAdditionalPackage("yast2-ntp-client");
+ }
+ }
+ //Otherwise, prompt user for confirming pkg installation
+ else
+ {
+ if (!PackageSystem::CheckAndInstallPackages([ required_package ]))
+ {
+ Report::Error(sformat( _("Synchronization with NTP server is not possible
+without having package %1 installed"), required_package));
+ }
+ }
integer status = -1;
string service_name = "ntp";
@@ -169,19 +192,11 @@
Service::Stop (service_name);
}
- //Schedule package for installation
- if (Package::Available("xntp"))
- // FIXME: later use
- // if (Package::Available("xntp")) { Packages::addAdditionalPackage("xntp"); }
- Packages::addAdditionalPackage("xntp");
- // bugzilla #327050
- // Agent for writing /etc/ntp.conf needs to be installed
- // to write the settings at the end of the installation
- Packages::addAdditionalPackage("yast2-ntp-client");
+ Popup::ShowFeedback("", _("Synchronizing with NTP server..."));
+ y2milestone("Running ntpdate to sync with %1", ntp_server);
integer r = (integer) SCR::Execute (.target.bash, sformat ("/usr/sbin/ntpdate '%1'", String::Quote(ntp_server)));
y2milestone ("'ntpdate %1' returned %2", ntp_server, r);
- Popup::ClearFeedback();
if( !Stage::initial())
{
@@ -196,7 +211,9 @@
AddSingleServer(ntp_server);
}
else
- ret = `ntpdate_failed;
+ ret = `ntpdate_failed;
+
+ Popup::ClearFeedback();
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.16.0/VERSION new/yast2-ntp-client-2.16.1/VERSION
--- old/yast2-ntp-client-2.16.0/VERSION 2007-10-03 18:54:26.000000000 +0200
+++ new/yast2-ntp-client-2.16.1/VERSION 2007-10-31 13:56:17.000000000 +0100
@@ -1 +1 @@
-2.16.0
+2.16.1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org