Hello community,
here is the log from the commit of package yast2-installation
checked in at Tue Nov 25 16:01:23 CET 2008.
--------
--- yast2-installation/yast2-installation.changes 2008-11-24 12:52:52.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-installation/yast2-installation.changes 2008-11-25 14:45:51.000000000 +0100
@@ -1,0 +2,7 @@
+Tue Nov 25 14:42:31 CET 2008 - locilka@suse.cz
+
+- Handling new feature of licenses ProductLicense::AcceptanceNeeded
+ (bnc #448598).
+- 2.17.40
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-installation-2.17.39.tar.bz2
New:
----
yast2-installation-2.17.40.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.ON9947/_old 2008-11-25 16:00:48.000000000 +0100
+++ /var/tmp/diff_new_pack.ON9947/_new 2008-11-25 16:00:48.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.17.39)
+# spec file for package yast2-installation (Version 2.17.40)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-installation
-Version: 2.17.39
+Version: 2.17.40
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.17.39.tar.bz2
+Source0: yast2-installation-2.17.40.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite
# PackageCallbacks::RegisterEmptyProgressCallbacks()
@@ -45,8 +45,8 @@
Requires: yast2-country-data >= 2.16.11
# Pkg::SourceProvideDigestedFile()
Conflicts: yast2-pkg-bindings < 2.17.25
-# Packages::required_patterns
-Requires: yast2-packager >= 2.17.23
+# ProductLicense::AcceptanceNeeded, BNC #448598
+Requires: yast2-packager >= 2.17.46
# Storage::GetCommitInfo() call in include/misc.ycp
Requires: yast2-storage >= 2.17.47
# Only in inst-sys
@@ -120,7 +120,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-installation-2.17.39
+%setup -n yast2-installation-2.17.40
%build
%{prefix}/bin/y2tool y2autoconf
@@ -189,6 +189,10 @@
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{prefix}/share/doc/packages/yast2-installation/README
%changelog
+* Tue Nov 25 2008 locilka@suse.cz
+- Handling new feature of licenses ProductLicense::AcceptanceNeeded
+ (bnc #448598).
+- 2.17.40
* Mon Nov 24 2008 locilka@suse.cz
- Completely initializing the target and sources before checking
for available patches and offering online update (bnc #447080).
++++++ yast2-installation-2.17.39.tar.bz2 -> yast2-installation-2.17.40.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.39/src/clients/inst_complex_welcome.ycp new/yast2-installation-2.17.40/src/clients/inst_complex_welcome.ycp
--- old/yast2-installation-2.17.39/src/clients/inst_complex_welcome.ycp 2008-10-27 16:41:07.000000000 +0100
+++ new/yast2-installation-2.17.40/src/clients/inst_complex_welcome.ycp 2008-11-25 14:46:06.000000000 +0100
@@ -74,6 +74,13 @@
Keyboard::GetKeyboardItems ()
);
+ // BNC #448598
+ // License sometimes doesn't need to be manually accepted
+ term license_agreement_checkbox = `Left (`CheckBox (
+ // bnc #359456
+ // TRANSLATORS: check-box
+ `id (`license_agreement), `opt (`notify), _("I &Agree to the License Terms."), InstData::product_license_accepted
+ ));
// this type of contents will be shown only for initial installation dialog
term contents = `VBox (
@@ -103,11 +110,8 @@
)),
`VSpacing (text_mode ? 0.1 : 0.5),
`MinHeight (1, `HBox (
- `Left (`CheckBox (
- // bnc #359456
- // TRANSLATORS: check-box
- `id (`license_agreement), `opt (`notify), _("I &Agree to the License Terms."), InstData::product_license_accepted
- )),
+ // Will be replaced with license checkbox if required
+ `ReplacePoint (`id (`license_checkbox_rp), `Empty()),
`VStretch (),
// TRANSLATORS: button label
`Right (`PushButton (`id (`show_fulscreen_license), _("License &Translations...")))
@@ -291,6 +295,11 @@
return `auto;
}
+ // If accepting the license is required, show the check-box
+ if (ProductLicense::AcceptanceNeeded()) {
+ UI::ReplaceWidget (`license_checkbox_rp, license_agreement_checkbox);
+ }
+
while (true) {
ret = UI::UserInput();
y2milestone ("UserInput() returned %1", ret);
@@ -313,7 +322,9 @@
ReadCurrentUIState();
if (ret == `next ) {
- if (! LicenseAccepted ())
+ // BNC #448598
+ // Check whether the license has been accepted only if required
+ if (ProductLicense::AcceptanceNeeded() && ! LicenseAccepted ())
continue;
if (!Language::CheckIncompleteTranslation (language))
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.17.39/VERSION new/yast2-installation-2.17.40/VERSION
--- old/yast2-installation-2.17.39/VERSION 2008-11-24 12:51:41.000000000 +0100
+++ new/yast2-installation-2.17.40/VERSION 2008-11-25 14:34:00.000000000 +0100
@@ -1 +1 @@
-2.17.39
+2.17.40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org