Hello community,
here is the log from the commit of package yast2-installation
checked in at Wed Jun 21 01:44:49 CEST 2006.
--------
--- yast2-installation/yast2-installation.changes 2006-06-15 18:42:15.000000000 +0200
+++ yast2-installation/yast2-installation.changes 2006-06-19 14:32:29.000000000 +0200
@@ -1,0 +2,14 @@
+Mon Jun 19 14:05:21 CEST 2006 - jsrain@suse.cz
+
+- report an error when failed to register the update source for
+ an add-on product (#185846)
+- 2.13.132
+
+-------------------------------------------------------------------
+Mon Jun 19 12:54:36 CEST 2006 - jsrain@suse.cz
+
+- ask about accepting license of add-on product added via the
+ /add_on_product file (#186148)
+- 2.13.131
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.13.130.tar.bz2
New:
----
yast2-installation-2.13.132.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.3mIAXB/_old 2006-06-21 01:44:44.000000000 +0200
+++ /var/tmp/diff_new_pack.3mIAXB/_new 2006-06-21 01:44:44.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.13.130)
+# spec file for package yast2-installation (Version 2.13.132)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-installation
-Version: 2.13.130
+Version: 2.13.132
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.13.130.tar.bz2
+Source0: yast2-installation-2.13.132.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-testsuite
Requires: yast2 yast2-update
@@ -51,7 +51,7 @@
Arvin Schnell
%prep
-%setup -n yast2-installation-2.13.130
+%setup -n yast2-installation-2.13.132
%build
%{prefix}/bin/y2tool y2autoconf
@@ -119,6 +119,14 @@
/usr/X11R6/share/fvwm/
%changelog -n yast2-installation
+* Mon Jun 19 2006 - jsrain@suse.cz
+- report an error when failed to register the update source for
+ an add-on product (#185846)
+- 2.13.132
+* Mon Jun 19 2006 - jsrain@suse.cz
+- ask about accepting license of add-on product added via the
+ /add_on_product file (#186148)
+- 2.13.131
* Thu Jun 15 2006 - mvidner@suse.cz
- Do not complain if ZMD cannot be stopped (#166900).
- When syncing the _original_ installation sources to ZMD,
++++++ yast2-installation-2.13.130.tar.bz2 -> yast2-installation-2.13.132.tar.bz2 ++++++
++++ 2117 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-installation-2.13.130/VERSION new/yast2-installation-2.13.132/VERSION
--- old/yast2-installation-2.13.130/VERSION 2006-06-15 14:48:05.000000000 +0200
+++ new/yast2-installation-2.13.132/VERSION 2006-06-19 14:07:06.000000000 +0200
@@ -1 +1 @@
-2.13.130
+2.13.132
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-installation-2.13.130/configure.in new/yast2-installation-2.13.132/configure.in
--- old/yast2-installation-2.13.130/configure.in 2006-06-15 18:44:06.000000000 +0200
+++ new/yast2-installation-2.13.132/configure.in 2006-06-19 14:31:04.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-installation
dnl
-dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.13.130, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.13.132, http://bugs.opensuse.org/, yast2-installation)
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.13.130"
+VERSION="2.13.132"
RPMNAME="yast2-installation"
MAINTAINER="Jiri Srain "
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-installation-2.13.130/control/docs/control-doc.xml new/yast2-installation-2.13.132/control/docs/control-doc.xml
--- old/yast2-installation-2.13.130/control/docs/control-doc.xml 2005-04-19 15:34:02.000000000 +0200
+++ new/yast2-installation-2.13.132/control/docs/control-doc.xml 2005-01-24 07:41:33.000000000 +0100
@@ -28,7 +28,7 @@
0.1
</revnumber>
<date>
- $Date: 2004-10-27 16:25:24 +0200 (St, 27 říj 2004) $
+ $Date: 2004-10-27 16:25:24 +0200 (Wed, 27 Oct 2004) $
</date>
<revremark>Initial Release as PDF</revremark>
</revision>
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-installation-2.13.130/src/clients/inst_addon_update_sources.ycp new/yast2-installation-2.13.132/src/clients/inst_addon_update_sources.ycp
--- old/yast2-installation-2.13.130/src/clients/inst_addon_update_sources.ycp 2006-06-08 15:31:34.000000000 +0200
+++ new/yast2-installation-2.13.132/src/clients/inst_addon_update_sources.ycp 2006-06-19 14:08:26.000000000 +0200
@@ -17,6 +17,7 @@
import "PackageCallbacksInit";
import "Popup";
import "SourceManager";
+import "Report";
if ( GetInstArgs::going_back()) // going backwards?
return `auto; // don't execute this once more
@@ -70,7 +71,15 @@
foreach (string u, addUrls, {
integer srcid = Pkg::SourceCreate (u, "/");
y2milestone ("got %1 from creating %2", srcid, u);
- added_ids = add (added_ids, srcid);
+ if (srcid == -1)
+ {
+ // FIXME add better error message
+ Report::Error (_("An error occurred while connecting to the server."));
+ }
+ else
+ {
+ added_ids = add (added_ids, srcid);
+ }
});
y2milestone ("syncing to zmd");
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-installation-2.13.130/src/modules/AddOnProduct.ycp new/yast2-installation-2.13.132/src/modules/AddOnProduct.ycp
--- old/yast2-installation-2.13.130/src/modules/AddOnProduct.ycp 2006-05-25 17:44:22.000000000 +0200
+++ new/yast2-installation-2.13.132/src/modules/AddOnProduct.ycp 2006-06-19 08:56:49.000000000 +0200
@@ -1044,6 +1044,11 @@
elements = remove (elements, 0);
elements = remove (elements, 0);
integer src = Pkg::SourceCreate (url, pth);
+ if (! AcceptedLicenseAndInfoFile(src))
+ {
+ Pkg::SourceDelete (src);
+ return;
+ }
Integrate (src);
if (size (elements) > 0)
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org