Hello community,
here is the log from the commit of package yast2-update
checked in at Fri Sep 12 02:00:44 CEST 2008.
--------
--- yast2-update/yast2-update.changes 2008-09-01 13:15:48.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-update/yast2-update.changes 2008-09-10 11:49:05.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Sep 10 11:40:36 CEST 2008 - locilka@suse.cz
+
+- Fixed selecting the recommended and removing the old kernels
+ while upgrading (bnc #423590).
+- 2.17.4
+
+-------------------------------------------------------------------
Old:
----
yast2-update-2.17.3.tar.bz2
New:
----
yast2-update-2.17.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-update.spec ++++++
--- /var/tmp/diff_new_pack.y21303/_old 2008-09-12 02:00:19.000000000 +0200
+++ /var/tmp/diff_new_pack.y21303/_new 2008-09-12 02:00:19.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-update (Version 2.17.3)
+# spec file for package yast2-update (Version 2.17.4)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-update
-Version: 2.17.3
+Version: 2.17.4
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-update-2.17.3.tar.bz2
+Source0: yast2-update-2.17.4.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-packager yast2-storage yast2-testsuite
# Wizard::OpenOKDialog
@@ -80,7 +80,7 @@
Jiri Srain
%prep
-%setup -n yast2-update-2.17.3
+%setup -n yast2-update-2.17.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -127,7 +127,12 @@
/usr/share/YaST2/control/update.xml
/usr/share/YaST2/clients/update.ycp
/usr/share/YaST2/clients/run_update.ycp
+
%changelog
+* Wed Sep 10 2008 locilka@suse.cz
+- Fixed selecting the recommended and removing the old kernels
+ while upgrading (bnc #423590).
+- 2.17.4
* Mon Sep 01 2008 locilka@suse.cz
- Obsolete EVMS-related code disabled.
- 2.17.3
++++++ yast2-update-2.17.3.tar.bz2 -> yast2-update-2.17.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.17.3/configure new/yast2-update-2.17.4/configure
--- old/yast2-update-2.17.3/configure 2008-09-01 13:17:11.000000000 +0200
+++ new/yast2-update-2.17.4/configure 2008-09-10 11:50:18.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-update 2.17.3.
+# Generated by GNU Autoconf 2.61 for yast2-update 2.17.4.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-update'
PACKAGE_TARNAME='yast2-update'
-PACKAGE_VERSION='2.17.3'
-PACKAGE_STRING='yast2-update 2.17.3'
+PACKAGE_VERSION='2.17.4'
+PACKAGE_STRING='yast2-update 2.17.4'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,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-update 2.17.3 to adapt to many kinds of systems.
+\`configure' configures yast2-update 2.17.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-update 2.17.3:";;
+ short | recursive ) echo "Configuration of yast2-update 2.17.4:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-update configure 2.17.3
+yast2-update configure 2.17.4
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,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-update $as_me 2.17.3, which was
+It was created by yast2-update $as_me 2.17.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-update'
- VERSION='2.17.3'
+ VERSION='2.17.4'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.17.3"
+VERSION="2.17.4"
RPMNAME="yast2-update"
MAINTAINER="Lukas Ocilka "
@@ -3306,7 +3306,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-update $as_me 2.17.3, which was
+This file was extended by yast2-update $as_me 2.17.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3349,7 +3349,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-update config.status 2.17.3
+yast2-update config.status 2.17.4
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.17.3/configure.in new/yast2-update-2.17.4/configure.in
--- old/yast2-update-2.17.3/configure.in 2008-09-01 13:17:08.000000000 +0200
+++ new/yast2-update-2.17.4/configure.in 2008-09-10 11:50:14.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-update, 2.17.3, http://bugs.opensuse.org/, yast2-update)
+AC_INIT(yast2-update, 2.17.4, http://bugs.opensuse.org/, yast2-update)
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.3"
+VERSION="2.17.4"
RPMNAME="yast2-update"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.17.3/src/clients/update_proposal.ycp new/yast2-update-2.17.4/src/clients/update_proposal.ycp
--- old/yast2-update-2.17.3/src/clients/update_proposal.ycp 2008-05-29 14:59:42.000000000 +0200
+++ new/yast2-update-2.17.4/src/clients/update_proposal.ycp 2008-09-10 11:49:51.000000000 +0200
@@ -5,7 +5,7 @@
*
* Purpose: Let user choose update settings.
*
- * $Id: update_proposal.ycp 47938 2008-05-29 12:59:41Z locilka $
+ * $Id: update_proposal.ycp 50940 2008-09-10 09:49:50Z locilka $
*/
{
textdomain "update";
@@ -153,7 +153,7 @@
// see bug 302398
define void SelectKernelPackages () {
list <list> provides = Pkg::PkgQueryProvides ("kernel");
- // e.g.: [["kernel-bigsmp", `CAND, `NONE], ["kernel-default", `CAND, `CAND], ["kernel-default", `BOTH, `INST]]
+ // // e.g.: [["kernel-bigsmp", `CAND, `NONE], ["kernel-default", `CAND, `CAND], ["kernel-default", `BOTH, `INST]]
y2milestone ("provides: %1", provides);
// these kernels would be installed
@@ -165,18 +165,20 @@
y2warning ("not exactly one package provides tag kernel");
string selected_kernel = kernels[0,0]:"none";
- list<string> recom_kernel = Kernel::ComputePackages ();
+ list <string> recom_kernel = Kernel::ComputePackages ();
+ string recommended_kernel = recom_kernel[0]:"";
+
y2milestone ("Selected kernel: %1, recommended kernel: %2",
selected_kernel, recom_kernel);
// when the recommended Kernel is not available (installable)
- if (recom_kernel[0]:nil != nil && ! Pkg::IsAvailable (recom_kernel[0]:nil)) {
- recom_kernel[0] = selected_kernel;
+ if (recommended_kernel != "" && ! Pkg::IsAvailable (recommended_kernel)) {
+ recommended_kernel = selected_kernel;
}
// recommended package is different to the selected one
// select the recommended one
- if (recom_kernel[0]:nil != nil && recom_kernel[0]:nil != selected_kernel) {
+ if (recommended_kernel != "" && recommended_kernel != selected_kernel) {
// list of kernels to be installed
list <string> kernels_to_be_installed = (list <string>) maplist (list one_kernel, kernels, {
return one_kernel[0]:nil;
@@ -185,15 +187,15 @@
return (one_kernel != nil && one_kernel != "");
});
- // remove old kernels
+ // remove all kernels (with some exceptions)
foreach (string one_kernel, kernels_to_be_installed, {
- // exception
+ // XEN can be installed in parallel
if (one_kernel == "kernel-xen") return;
- // the recommended one
- if (one_kernel == recom_kernel[0]:nil) return;
+ // don't remove the recommended one
+ if (one_kernel == recommended_kernel) return;
+ // remove all packages of that kernel
list <string> packages_to_remove = Kernel::ComputePackagesForBase (one_kernel, false);
-
if (packages_to_remove != nil && size (packages_to_remove) > 0) {
y2milestone ("Removing installed packages %1", packages_to_remove);
Pkg::DoRemove (packages_to_remove);
@@ -203,10 +205,10 @@
// compute recommended kernel packages
list<string> kernel_packs = Kernel::ComputePackages ();
- // checking all recommended packages
+ // installing all recommended packages
foreach (string p, kernel_packs, {
- if (! Pkg::IsProvided (p)) {
- y2milestone ("Package %1 is not installed - forcing kernel update", p);
+ if (Pkg::IsProvided (p)) {
+ y2milestone ("Selecting package %1 for installation", p);
Pkg::PkgInstall (p);
}
});
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.17.3/VERSION new/yast2-update-2.17.4/VERSION
--- old/yast2-update-2.17.3/VERSION 2008-09-01 13:15:16.000000000 +0200
+++ new/yast2-update-2.17.4/VERSION 2008-09-10 11:40:30.000000000 +0200
@@ -1 +1 @@
-2.17.3
+2.17.4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org