Hello community,
here is the log from the commit of package yast2-packager
checked in at Fri Mar 23 01:49:16 CET 2007.
--------
--- yast2-packager/yast2-packager.changes 2007-03-13 16:32:15.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2007-03-22 10:41:12.183383000 +0100
@@ -1,0 +2,13 @@
+Thu Mar 22 10:18:12 CET 2007 - lslezak@suse.cz
+
+- display remaining unconfirmed licenses of selected packages
+ (#242298)
+- 2.15.24
+
+-------------------------------------------------------------------
+Tue Mar 20 15:23:45 CET 2007 - lslezak@suse.cz
+
+- display timeout value in seconds instead of milliseconds
+ (#223808)
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.15.23.tar.bz2
New:
----
yast2-packager-2.15.24.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.g32605/_old 2007-03-23 01:49:11.000000000 +0100
+++ /var/tmp/diff_new_pack.g32605/_new 2007-03-23 01:49:11.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.15.23)
+# spec file for package yast2-packager (Version 2.15.24)
#
# 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-packager
-Version: 2.15.23
+Version: 2.15.24
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.15.23.tar.bz2
+Source0: yast2-packager-2.15.24.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-slp yast2-testsuite yast2-xml
Requires: yast2-country
@@ -48,7 +48,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.15.23
+%setup -n yast2-packager-2.15.24
%build
%{prefix}/bin/y2tool y2autoconf
@@ -87,6 +87,13 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog
+* Thu Mar 22 2007 - lslezak@suse.cz
+- display remaining unconfirmed licenses of selected packages
+ (#242298)
+- 2.15.24
+* Tue Mar 20 2007 - lslezak@suse.cz
+- display timeout value in seconds instead of milliseconds
+ (#223808)
* Tue Mar 13 2007 - locilka@suse.cz
- Making AddOnProduct::RedrawWizardSteps function global to be able
to redraw Wizard look from whereever we need.
++++++ yast2-packager-2.15.23.tar.bz2 -> yast2-packager-2.15.24.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.23/configure new/yast2-packager-2.15.24/configure
--- old/yast2-packager-2.15.23/configure 2007-03-13 15:57:21.000000000 +0100
+++ new/yast2-packager-2.15.24/configure 2007-03-22 10:32:38.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-packager 2.15.23.
+# Generated by GNU Autoconf 2.60 for yast2-packager 2.15.24.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.15.23'
-PACKAGE_STRING='yast2-packager 2.15.23'
+PACKAGE_VERSION='2.15.24'
+PACKAGE_STRING='yast2-packager 2.15.24'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1181,7 +1181,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-packager 2.15.23 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.15.24 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1252,7 +1252,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-packager 2.15.23:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.15.24:";;
esac
cat <<\_ACEOF
@@ -1330,7 +1330,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.15.23
+yast2-packager configure 2.15.24
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1344,7 +1344,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-packager $as_me 2.15.23, which was
+It was created by yast2-packager $as_me 2.15.24, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2145,7 +2145,7 @@
# Define the identity of the package.
PACKAGE='yast2-packager'
- VERSION='2.15.23'
+ VERSION='2.15.24'
cat >>confdefs.h <<_ACEOF
@@ -2372,7 +2372,7 @@
-VERSION="2.15.23"
+VERSION="2.15.24"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
@@ -3260,7 +3260,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-packager $as_me 2.15.23, which was
+This file was extended by yast2-packager $as_me 2.15.24, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3303,7 +3303,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-packager config.status 2.15.23
+yast2-packager config.status 2.15.24
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.23/configure.in new/yast2-packager-2.15.24/configure.in
--- old/yast2-packager-2.15.23/configure.in 2007-03-13 15:57:16.000000000 +0100
+++ new/yast2-packager-2.15.24/configure.in 2007-03-22 10:32:32.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.15.23, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.15.24, http://bugs.opensuse.org/, yast2-packager)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.23"
+VERSION="2.15.24"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.23/src/clients/sw_single.ycp new/yast2-packager-2.15.24/src/clients/sw_single.ycp
--- old/yast2-packager-2.15.23/src/clients/sw_single.ycp 2007-02-19 13:54:07.000000000 +0100
+++ new/yast2-packager-2.15.24/src/clients/sw_single.ycp 2007-03-22 10:32:14.000000000 +0100
@@ -7,7 +7,7 @@
* Purpose: contains dialog loop for workflows:
* "Install/Remove software"
*
- * $Id: sw_single.ycp 36248 2007-02-19 09:32:04Z lslezak $
+ * $Id: sw_single.ycp 37078 2007-03-22 09:32:12Z lslezak $
*/
{
@@ -30,6 +30,7 @@
import "PackageSystem";
import "Report";
import "FileUtils";
+ import "PackagesUI";
Wizard::CreateDialog();
Wizard::SetDesktopIcon("sw_single");
@@ -297,10 +298,13 @@
boolean ask = false;
+ boolean force_restart = false;
boolean found_descr = result == `found_descr;
do
{
+ force_restart = false;
+
list<string> old_failed_packs = [];
if ((integer)SCR::Read (.target.size,
"/var/lib/YaST2/failed_packages") > 0)
@@ -389,6 +393,17 @@
if (result == `next) // packages selected ?
{
+ // ask user to confirm all remaining licenses (#242298)
+ boolean licenses_accepted = PackagesUI::ConfirmLicenses();
+
+ // all licenses accepted?
+ if (!licenses_accepted)
+ {
+ // no, go back to the package selection
+ force_restart = true;
+ continue;
+ }
+
SCR::Write (.target.ycp, "/var/lib/YaST2/failed_packages", []);
boolean anyToDelete = Pkg::PkgAnyToDelete();
SlideShow::SetLanguage (UI::GetLanguage(true));
@@ -414,9 +429,9 @@
result = (symbol) WFM::CallFunction ("inst_suseconfig", [GetInstArgs::Buttons(false, false)]);
}
}
- } while ( ask && Popup::YesNo (
+ } while ( force_restart || (ask && Popup::YesNo (
// Popup dialog contents
- _("Install or remove more packages?")));
+ _("Install or remove more packages?"))));
UI::CloseDialog();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.23/src/modules/PackagesUI.ycp new/yast2-packager-2.15.24/src/modules/PackagesUI.ycp
--- old/yast2-packager-2.15.23/src/modules/PackagesUI.ycp 2006-12-12 08:26:19.000000000 +0100
+++ new/yast2-packager-2.15.24/src/modules/PackagesUI.ycp 2007-03-22 10:32:14.000000000 +0100
@@ -6,7 +6,7 @@
* Purpose: Provides a number of common popups
* for the package installation.
*
- * $Id: PackagesUI.ycp 12810 2003-11-26 11:52:52Z msvec $
+ * $Id: PackagesUI.ycp 37078 2007-03-22 09:32:12Z lslezak $
*/
{
@@ -54,4 +54,87 @@
return r;
}
+ /**
+ * Display unconfirmed licenses of the selected packages.
+ * @return boolean true when all licenses were accepted (or there was no license to confirm)
+ */
+ global define boolean ConfirmLicenses ()
+ {
+ boolean ret = true;
+
+ list<string> to_install = Pkg::GetPackages (`selected, true);
+ map licenses = Pkg::PkgGetLicensesToConfirm (to_install);
+
+ y2milestone("Licenses to confirm: %1", licenses);
+
+ foreach (string package, string license, licenses, {
+ term popup = `VBox (
+ `HSpacing (80),
+ // dialog heading, %1 is package name
+ `Heading (sformat (_("Confirm Package License: %1"),
+ package)),
+ `HBox (
+ `VSpacing (20),
+ `RichText (`id (`lic), license)
+ ),
+ `HBox (
+ `PushButton (`id (`help), Label::HelpButton ()),
+ `HStretch (),
+ // push button
+ `PushButton (`id (`accept), _("I &Agree")),
+ // push button
+ `PushButton (`id (`deny), _("I &Disagree"))
+ )
+ );
+ UI::OpenDialog (popup);
+ symbol ui = nil;
+ while (ui == nil)
+ {
+ ui = (symbol)UI::UserInput ();
+ if (ui == `help)
+ {
+ ui = nil;
+ // help text
+ string help = _("<p><b><big>License Confirmation</big></b><br>
+The package in the headline of the dialog requires an explicit confirmation
+of acceptance of its license.
+If you reject the license of the package, the package will not be installed.
+<br>
+To accept the license of the package, click <b>I Agree</b>.
+To reject the license of the package, click <b>I Disagree</b></p>.");
+ UI::OpenDialog (`HBox (
+ `VSpacing (18),
+ `VBox (
+ `HSpacing (70),
+ `RichText (help),
+ `HBox (
+ `HStretch (),
+ // push button
+ `PushButton (`id (`close), Label::CloseButton ()),
+ `HStretch ()
+ )
+ )
+ ));
+ UI::UserInput ();
+ UI::CloseDialog ();
+ }
+ }
+ UI::CloseDialog ();
+
+ y2milestone("License of package %1 accepted: %2", package, ui == `accept);
+
+ if (ui != `accept)
+ {
+ Pkg::PkgTaboo (package);
+ ret = false;
+ }
+ else
+ {
+ Pkg::PkgMarkLicenseConfirmed (package);
+ }
+ });
+
+ return ret;
+ }
+
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.23/src/modules/SourceManager.ycp new/yast2-packager-2.15.24/src/modules/SourceManager.ycp
--- old/yast2-packager-2.15.23/src/modules/SourceManager.ycp 2007-03-09 09:47:58.000000000 +0100
+++ new/yast2-packager-2.15.24/src/modules/SourceManager.ycp 2007-03-20 15:34:17.000000000 +0100
@@ -7,7 +7,7 @@
* Martin Vidner
* Status: Work in Progress
*
- * $Id: SourceManager.ycp 36799 2007-03-08 17:06:50Z mvidner $
+ * $Id: SourceManager.ycp 37044 2007-03-20 14:34:15Z lslezak $
*
* Representation of the configuration of source-manager.
* Input and output routines.
@@ -1038,7 +1038,9 @@
else if (haskey (ret, "timed_out"))
// error message
// FIXME "ms" or plural gettext
- message = message + "\n" + sformat (_("Command timed out after %1 milliseconds."), ret["timed_out"]:1000);
+ message = message + "\n" + (ret["timed_out"]:1000 < 1000 ? sformat (_("Command timed out after %1 milliseconds."), ret["timed_out"]:1000)
+ // error message
+ : sformat (_("Command timed out after %1 seconds."), (ret["timed_out"]:1000)/1000));
Report::LongError (message);
return false;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.23/test.pot new/yast2-packager-2.15.24/test.pot
--- old/yast2-packager-2.15.23/test.pot 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-packager-2.15.24/test.pot 2006-12-13 09:58:56.000000000 +0100
@@ -0,0 +1,37 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-12-13 09:58+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. help text
+#: src/modules/test.ycp:30
+msgid "Start installation in a virtual machine"
+msgstr ""
+
+#. command description
+#: src/modules/test.ycp:38
+msgid "Start installation"
+msgstr ""
+
+#. option description
+#: src/modules/test.ycp:45
+msgid "List only configured devices"
+msgstr ""
+
+#. option description
+#: src/modules/test.ycp:49
+msgid "List all detected IDE devices"
+msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.23/VERSION new/yast2-packager-2.15.24/VERSION
--- old/yast2-packager-2.15.23/VERSION 2007-03-13 15:21:59.000000000 +0100
+++ new/yast2-packager-2.15.24/VERSION 2007-03-22 10:18:09.000000000 +0100
@@ -1 +1 @@
-2.15.23
+2.15.24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org