Hello community,
here is the log from the commit of package yast2-packager
checked in at Wed Jun 21 01:47:51 CEST 2006.
--------
--- yast2-packager/yast2-packager.changes 2006-06-12 15:57:11.000000000 +0200
+++ yast2-packager/yast2-packager.changes 2006-06-20 17:00:09.000000000 +0200
@@ -1,0 +2,20 @@
+Tue Jun 20 16:41:03 CEST 2006 - jsrain@suse.cz
+
+- abort installation completly if package installation aborted
+ (#186660)
+- 2.13.138
+
+-------------------------------------------------------------------
+Mon Jun 19 13:13:37 CEST 2006 - jsrain@suse.cz
+
+- ask about add-on product license if add-on product was used as
+ bootable medium (#186148)
+- 2.13.137
+
+-------------------------------------------------------------------
+Tue Jun 13 12:49:32 CEST 2006 - ug@suse.de
+
+- a warning popups breaks autoinstallation (#184349)
+- 2.13.136
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.13.135.tar.bz2
New:
----
yast2-packager-2.13.138.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.hKXnyG/_old 2006-06-21 01:47:39.000000000 +0200
+++ /var/tmp/diff_new_pack.hKXnyG/_new 2006-06-21 01:47:39.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.13.135)
+# spec file for package yast2-packager (Version 2.13.138)
#
# 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-packager
-Version: 2.13.135
+Version: 2.13.138
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.13.135.tar.bz2
+Source0: yast2-packager-2.13.138.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-installation yast2-testsuite yast2-xml
Requires: yast2 checkmedia yast2-country
@@ -45,7 +45,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.13.135
+%setup -n yast2-packager-2.13.138
%build
%{prefix}/bin/y2tool y2autoconf
@@ -82,6 +82,17 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog -n yast2-packager
+* Tue Jun 20 2006 - jsrain@suse.cz
+- abort installation completly if package installation aborted
+ (#186660)
+- 2.13.138
+* Mon Jun 19 2006 - jsrain@suse.cz
+- ask about add-on product license if add-on product was used as
+ bootable medium (#186148)
+- 2.13.137
+* Tue Jun 13 2006 - ug@suse.de
+- a warning popups breaks autoinstallation (#184349)
+- 2.13.136
* Mon Jun 12 2006 - mvidner@suse.cz
- Respect /etc/sysconfig/security:CHECK_SIGNATURES in callbacks.
- 2.13.135
++++++ yast2-packager-2.13.135.tar.bz2 -> yast2-packager-2.13.138.tar.bz2 ++++++
++++ 2461 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.13.135/VERSION new/yast2-packager-2.13.138/VERSION
--- old/yast2-packager-2.13.135/VERSION 2006-06-12 15:56:01.000000000 +0200
+++ new/yast2-packager-2.13.138/VERSION 2006-06-20 16:48:40.000000000 +0200
@@ -1 +1 @@
-2.13.135
+2.13.138
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.13.135/configure.in new/yast2-packager-2.13.138/configure.in
--- old/yast2-packager-2.13.135/configure.in 2006-06-12 16:00:46.000000000 +0200
+++ new/yast2-packager-2.13.138/configure.in 2006-06-20 16:58:51.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-packager
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-packager, 2.13.135, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.13.138, 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.13.135"
+VERSION="2.13.138"
RPMNAME="yast2-packager"
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-packager-2.13.135/src/clients/inst_rpmcopy.ycp new/yast2-packager-2.13.138/src/clients/inst_rpmcopy.ycp
--- old/yast2-packager-2.13.135/src/clients/inst_rpmcopy.ycp 2006-06-12 10:00:12.000000000 +0200
+++ new/yast2-packager-2.13.138/src/clients/inst_rpmcopy.ycp 2006-06-20 16:47:29.000000000 +0200
@@ -13,7 +13,7 @@
* Packages module :
* "installed"
*
- * $Id: inst_rpmcopy.ycp 31409 2006-06-09 07:56:33Z jsrain $
+ * $Id: inst_rpmcopy.ycp 31575 2006-06-20 14:47:21Z jsrain $
*/
{
@@ -655,6 +655,10 @@
// returns [ int successful, list failed, list remaining ]
list commit_result = PackageInstallation::CommitPackages( current_cd_no, 0 );
+ if (size (commit_result) == 0)
+ {
+ return `abort;
+ }
integer count = commit_result[0]:0;
y2milestone ("%1 packages installed", count);
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.13.135/src/modules/Packages.ycp new/yast2-packager-2.13.138/src/modules/Packages.ycp
--- old/yast2-packager-2.13.135/src/modules/Packages.ycp 2006-06-12 10:00:12.000000000 +0200
+++ new/yast2-packager-2.13.138/src/modules/Packages.ycp 2006-06-20 16:45:23.000000000 +0200
@@ -3,7 +3,7 @@
* Package: Package selections
* Authors: Anas Nashif
*
- * $Id: Packages.ycp 31390 2006-06-08 11:49:54Z schubi $
+ * $Id: Packages.ycp 31512 2006-06-19 11:14:09Z jsrain $
*/
{
@@ -77,6 +77,8 @@
global string add_on_products_list = nil;
+ boolean init_popup_open = false;
+
global boolean SelectProduct ();
/**
@@ -642,24 +644,34 @@
y2milestone ("Filling %1", spdir);
WFM::Execute(.local.bash, "tar -zxvf " +
servicepack_metadata + " -C " + spdir);
- if ((integer)WFM::Read (.local.size, spdir + "/installation.xml") > 0)
- {
- AddOnProduct::WFIntegrate (spdir + "/installation.xml");
- }
- if ((integer)WFM::Read (.local.size, spdir + "/y2update.tgz") > 0)
- {
- AddOnProduct::UpdateInstSys (spdir + "/y2update.tgz");
- }
string sp_url = "dir:" + spdir;
integer sp_source = Pkg::SourceCreate (sp_url, "");
+ // close the popup in order to be able to ask about the license
+ if (init_popup_open)
+ UI::CloseDialog ();
if (sp_source == -1)
Report::Error (_("Failed to integrate service pack source."));
+ else if (! AddOnProduct::AcceptedLicenseAndInfoFile(sp_source))
+ {
+ y2milestone ("service pack license rejected");
+ Pkg::SourceDelete (sp_source);
+ }
else
{
+ if ((integer)WFM::Read (.local.size, spdir + "/installation.xml") > 0)
+ {
+ AddOnProduct::WFIntegrate (spdir + "/installation.xml");
+ }
+ if ((integer)WFM::Read (.local.size, spdir + "/y2update.tgz") > 0)
+ {
+ AddOnProduct::UpdateInstSys (spdir + "/y2update.tgz");
+ }
theSources = add (theSources, sp_source);
y2internal ("Service pack source: %1, changing to URL: %2", sp_source, base_url);
Pkg::SourceChangeUrl (sp_source, base_url);
}
+ if (init_popup_open)
+ UI::OpenDialog(`opt(`decorated ), `Label(_("Initializing catalogs...")));
}
if (ProductFeatures::GetFeature ("software", "selection_type") == `fixed)
@@ -1342,11 +1354,13 @@
global void InitializeCatalogs() {
// Intermediate contents of the software selection screen
UI::OpenDialog(`opt(`decorated ), `Label(_("Initializing catalogs...")));
+ init_popup_open = true;
// intialize package source to get a list of selections
Packages::Init (false);
UI::CloseDialog ();
+ init_popup_open = false;
}
/* EOF */
}
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.13.135/src/modules/SlideShowCallbacks.ycp new/yast2-packager-2.13.138/src/modules/SlideShowCallbacks.ycp
--- old/yast2-packager-2.13.135/src/modules/SlideShowCallbacks.ycp 2006-04-19 12:59:39.000000000 +0200
+++ new/yast2-packager-2.13.138/src/modules/SlideShowCallbacks.ycp 2006-06-20 16:45:24.000000000 +0200
@@ -21,7 +21,7 @@
import "Popup";
import "SlideShow";
- boolean shutup = false; // show the disk space warning popup only once
+ boolean shutup = ( Mode::autoinst() )?(true):(false); // show the disk space warning popup only once and never in autoinstall
boolean _remote_provide = false;
boolean user_abort = false;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org