Hello community,
here is the log from the commit of package yast2-packager
checked in at Tue Nov 25 16:01:44 CET 2008.
--------
--- yast2-packager/yast2-packager.changes 2008-11-21 17:26:14.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2008-11-25 14:42:13.000000000 +0100
@@ -1,0 +2,8 @@
+Tue Nov 25 14:38:34 CET 2008 - locilka@suse.cz
+
+- New flag no-acceptance-needed in licenses defines that users do
+ not have to manually choose whether they accept the license
+ agreement (bnc #448598).
+- 2.17.46
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-packager-2.17.45.tar.bz2
New:
----
yast2-packager-2.17.46.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.Y11824/_old 2008-11-25 16:01:34.000000000 +0100
+++ /var/tmp/diff_new_pack.Y11824/_new 2008-11-25 16:01:34.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.17.45)
+# spec file for package yast2-packager (Version 2.17.46)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-packager
-Version: 2.17.45
+Version: 2.17.46
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.17.45.tar.bz2
+Source0: yast2-packager-2.17.46.tar.bz2
Prefix: /usr
BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer update-desktop-files yast2-country-data yast2-devtools yast2-slp yast2-testsuite yast2-xml
# HTTP.ycp
@@ -78,7 +78,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.17.45
+%setup -n yast2-packager-2.17.46
%build
%{prefix}/bin/y2tool y2autoconf
@@ -114,6 +114,11 @@
%{prefix}/lib/YaST2/servers_non_y2/ag_*
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog
+* Tue Nov 25 2008 locilka@suse.cz
+- New flag no-acceptance-needed in licenses defines that users do
+ not have to manually choose whether they accept the license
+ agreement (bnc #448598).
+- 2.17.46
* Fri Nov 21 2008 lslezak@suse.cz
- install openssh if "usessh=1" install option is used (bnc#446581)
- 2.17.45
++++++ yast2-packager-2.17.45.tar.bz2 -> yast2-packager-2.17.46.tar.bz2 ++++++
++++ 3302 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.17.45/configure.in new/yast2-packager-2.17.46/configure.in
--- old/yast2-packager-2.17.45/configure.in 2008-11-21 17:28:10.000000000 +0100
+++ new/yast2-packager-2.17.46/configure.in 2008-10-09 19:19:24.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.17.45, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.17.27, http://bugs.opensuse.org/, yast2-packager)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.45"
+VERSION="2.17.27"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.17.45/src/modules/ProductLicense.ycp new/yast2-packager-2.17.46/src/modules/ProductLicense.ycp
--- old/yast2-packager-2.17.45/src/modules/ProductLicense.ycp 2008-11-07 16:03:33.000000000 +0100
+++ new/yast2-packager-2.17.46/src/modules/ProductLicense.ycp 2008-11-25 14:13:09.000000000 +0100
@@ -202,6 +202,36 @@
);
}
+// BNC #448598
+// no-acceptance-needed file in license.tar.gz means the license
+// doesn't have to be accepted by user, just displayed
+boolean license_acceptance_needed = true;
+
+/**
+ * Returns whether accepting the license manually is requied.
+ *
+ * @see BNC #448598
+ * @return boolean if required
+ */
+global boolean AcceptanceNeeded () {
+ return (license_acceptance_needed == true);
+}
+
+void SetAcceptanceNeeded (boolean new_value) {
+ if (new_value == nil) {
+ y2error ("Undefined behavior, AcceptanceNeeded: %1", new_value);
+ return;
+ }
+
+ license_acceptance_needed = new_value;
+
+ if (license_acceptance_needed) {
+ y2milestone ("License agreement WILL be required");
+ } else {
+ y2milestone ("License agreement will NOT be required");
+ }
+}
+
/**
* Displays License with Help and ( ) Yes / ( ) No radio buttons
* @param string file with the license
@@ -213,13 +243,7 @@
// dialog caption
string caption = _("License Agreement");
- term contents = `VBox (
- `VSpacing (1),
- `HBox (
- `HSpacing (2*space),
- GetLicenseDialogTerm (languages, license_language, licenses),
- `HSpacing (2*space)
- ),
+ term license_buttons = `VBox (
`VSpacing (2),
`RadioButtonGroup(`id(`eula),
`HBox(
@@ -238,6 +262,23 @@
),
`HSpacing (2*space)
)
+ )
+ );
+
+ term contents = `VBox (
+ `VSpacing (1),
+ `HBox (
+ `HSpacing (2*space),
+ GetLicenseDialogTerm (languages, license_language, licenses),
+ `HSpacing (2*space)
+ ),
+ // BNC #448598
+ // yes/no buttons exist only if needed
+ // if they don't exist, user is not asked to accept the license later
+ (AcceptanceNeeded() ?
+ license_buttons
+ :
+ `Empty()
),
`VSpacing(1),
`HBox (
@@ -266,8 +307,12 @@
the configuration will be aborted.</p>
");
+ // If acceptance is not needed, there's no need to disable the button
+ // by default
+ boolean default_next_button_state = (AcceptanceNeeded() ? false : true);
+
Wizard::SetContents(caption, contents, help,
- back, false);
+ back, default_next_button_state);
Wizard::SetTitleIcon ("yast-license");
Wizard::SetFocusToNextButton();
@@ -551,6 +596,10 @@
list <string> & available_langs, boolean require_agreement, string & license_ident) {
GetSourceLicenseDirectory (src_id, dir);
+ if (FileUtils::Exists (sformat ("%1/no-acceptance-needed", license_dir))) {
+ SetAcceptanceNeeded (false);
+ }
+
licenses = LicenseFiles (license_dir,
["license.txt", "license\\.%1\\.txt"]);
if (info_file == nil && size (licenses) == 0)
@@ -617,13 +666,17 @@
// agreement might be required even if license has been already accepted
// defined, properly ($md5sum(32)-(1)$size(1..n))
+ //
+ // see also BNC #448598
+ // Even if it it shown it sometimes doesn't need to be even accepted by
+ // selecting "yes, I agree"
if (require_agreement != true && tostring (license_ident) != nil && size (license_ident) > 33 && IsLicenseAlreadyAccepted (license_ident)) {
- y2milestone ("License has been already accepted");
+ y2milestone ("License has been already accepted/shown");
CleanUpLicense (tmpdir);
return `accepted;
} else {
- y2milestone ("License needs to be accepted");
+ y2milestone ("License needs to be shown");
}
// bugzilla #303922
@@ -665,9 +718,14 @@
Wizard::EnableNextButton();
}
- // FIXME: rewrite this if () ... else if () ... else {};
- // to something readable, please!
- symbol accept = (symbol) UI::QueryWidget(`id(`eula), `CurrentButton);
+ // BNC #448598
+ // If buttons don't exist, eula is automatically accepted
+ symbol accept = (AcceptanceNeeded() ?
+ (symbol) UI::QueryWidget(`id(`eula), `CurrentButton)
+ :
+ `yes
+ );
+
// Aborting the license dialog
if (ret == `abort) {
// bugzilla #218677
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.17.45/VERSION new/yast2-packager-2.17.46/VERSION
--- old/yast2-packager-2.17.45/VERSION 2008-11-21 17:26:21.000000000 +0100
+++ new/yast2-packager-2.17.46/VERSION 2008-11-25 14:32:23.000000000 +0100
@@ -1 +1 @@
-2.17.45
+2.17.46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org