Hello community,
here is the log from the commit of package yast2-update
checked in at Thu Apr 24 01:57:31 CEST 2008.
--------
--- yast2-update/yast2-update.changes 2008-04-14 13:14:21.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-update/yast2-update.changes 2008-04-23 15:40:23.000000000 +0200
@@ -1,0 +2,9 @@
+Wed Apr 23 15:29:55 CEST 2008 - locilka@suse.cz
+
+- Added new client for run_update that does the real update, the
+ old update client is left to handle command-line or to call
+ the new client (bnc #382044).
+- Fixed update proposal not to propose two kernels (bnc #382208).
+- 2.16.7
+
+-------------------------------------------------------------------
Old:
----
yast2-update-2.16.6.tar.bz2
New:
----
yast2-update-2.16.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-update.spec ++++++
--- /var/tmp/diff_new_pack.pi4507/_old 2008-04-24 01:57:14.000000000 +0200
+++ /var/tmp/diff_new_pack.pi4507/_new 2008-04-24 01:57:14.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-update (Version 2.16.6)
+# spec file for package yast2-update (Version 2.16.7)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-update
-Version: 2.16.6
+Version: 2.16.7
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-update-2.16.6.tar.bz2
+Source0: yast2-update-2.16.7.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-packager yast2-storage yast2-testsuite
# Wizard::OpenOKDialog
@@ -73,7 +73,7 @@
Jiri Srain
%prep
-%setup -n yast2-update-2.16.6
+%setup -n yast2-update-2.16.7
%build
%{prefix}/bin/y2tool y2autoconf
@@ -118,8 +118,14 @@
%{prefix}/share/applications/YaST2/update.desktop
/usr/share/YaST2/control/update.xml
/usr/share/YaST2/clients/update.ycp
-
+/usr/share/YaST2/clients/run_update.ycp
%changelog
+* Wed Apr 23 2008 locilka@suse.cz
+- Added new client for run_update that does the real update, the
+ old update client is left to handle command-line or to call
+ the new client (bnc #382044).
+- Fixed update proposal not to propose two kernels (bnc #382208).
+- 2.16.7
* Fri Apr 11 2008 locilka@suse.cz
- Added missing </p> (bnc #377476).
- Changing Accept buttons to OK buttons (FATE #120373).
++++++ yast2-update-2.16.6.tar.bz2 -> yast2-update-2.16.7.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.16.6/configure new/yast2-update-2.16.7/configure
--- old/yast2-update-2.16.6/configure 2008-04-14 13:14:52.000000000 +0200
+++ new/yast2-update-2.16.7/configure 2008-04-23 15:41:06.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.16.6.
+# Generated by GNU Autoconf 2.61 for yast2-update 2.16.7.
#
# 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.16.6'
-PACKAGE_STRING='yast2-update 2.16.6'
+PACKAGE_VERSION='2.16.7'
+PACKAGE_STRING='yast2-update 2.16.7'
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.16.6 to adapt to many kinds of systems.
+\`configure' configures yast2-update 2.16.7 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.16.6:";;
+ short | recursive ) echo "Configuration of yast2-update 2.16.7:";;
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.16.6
+yast2-update configure 2.16.7
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.16.6, which was
+It was created by yast2-update $as_me 2.16.7, 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.16.6'
+ VERSION='2.16.7'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.16.6"
+VERSION="2.16.7"
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.16.6, which was
+This file was extended by yast2-update $as_me 2.16.7, 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.16.6
+yast2-update config.status 2.16.7
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.16.6/configure.in new/yast2-update-2.16.7/configure.in
--- old/yast2-update-2.16.6/configure.in 2008-04-14 13:14:46.000000000 +0200
+++ new/yast2-update-2.16.7/configure.in 2008-04-23 15:41:02.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-update, 2.16.6, http://bugs.opensuse.org/, yast2-update)
+AC_INIT(yast2-update, 2.16.7, 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.16.6"
+VERSION="2.16.7"
RPMNAME="yast2-update"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.16.6/src/clients/Makefile.am new/yast2-update-2.16.7/src/clients/Makefile.am
--- old/yast2-update-2.16.6/src/clients/Makefile.am 2007-12-13 12:57:12.000000000 +0100
+++ new/yast2-update-2.16.7/src/clients/Makefile.am 2008-04-23 15:27:09.000000000 +0200
@@ -12,7 +12,8 @@
packages_proposal.ycp \
backup_proposal.ycp \
update.ycp \
- inst_update_partition.ycp
+ inst_update_partition.ycp \
+ run_update.ycp
EXTRA_DIST = $(client_DATA)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.16.6/src/clients/Makefile.in new/yast2-update-2.16.7/src/clients/Makefile.in
--- old/yast2-update-2.16.6/src/clients/Makefile.in 2008-04-14 13:14:53.000000000 +0200
+++ new/yast2-update-2.16.7/src/clients/Makefile.in 2008-04-23 15:41:08.000000000 +0200
@@ -187,7 +187,8 @@
packages_proposal.ycp \
backup_proposal.ycp \
update.ycp \
- inst_update_partition.ycp
+ inst_update_partition.ycp \
+ run_update.ycp
EXTRA_DIST = $(client_DATA)
modulebin_DATA = $(patsubst %.ycp,%.ybc,$(module_DATA))
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.16.6/src/clients/run_update.ycp new/yast2-update-2.16.7/src/clients/run_update.ycp
--- old/yast2-update-2.16.6/src/clients/run_update.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-update-2.16.7/src/clients/run_update.ycp 2008-04-23 15:26:53.000000000 +0200
@@ -0,0 +1,49 @@
+/**
+ * File: clients/update.ycp
+ * Module: System update
+ * Summary: Update client that actually does the update
+ * it's called from ypdate.ycp
+ * Authors: Klaus Kaempf
+ * Arvin Schnell
+ * Lukas Ocilka
+ *
+ * $Id$
+ */
+
+{
+ textdomain "update";
+
+ import "PackageLock";
+ import "Mode";
+ import "ProductControl";
+ import "Wizard";
+ import "Update";
+
+ // check whether having the packager for ourselves
+ if (! PackageLock::Check ())
+ return `abort;
+
+ // set normal mode and update
+ Mode::SetMode ("update");
+
+ Update::disallow_upgrade = true;
+ Update::onlyUpdateInstalled = true;
+ Update::deleteOldPackages = false;
+
+ ProductControl::custom_control_file = "/usr/share/YaST2/control/update.xml";
+
+ Wizard::OpenNextBackStepsDialog();
+ Wizard::SetNextButton(`next, _("&Update"));
+ if (!ProductControl::Init())
+ {
+ y2error("control file %1 not found", ProductControl::custom_control_file );
+ }
+ list<map> stage_mode = [$["stage": "normal", "mode": Mode::mode() ]];
+ ProductControl::AddWizardSteps(stage_mode);
+
+ symbol ret = ProductControl::Run();
+
+ Wizard::CloseDialog ();
+
+ return `next;
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.16.6/src/clients/update_proposal.ycp new/yast2-update-2.16.7/src/clients/update_proposal.ycp
--- old/yast2-update-2.16.6/src/clients/update_proposal.ycp 2008-04-11 18:07:35.000000000 +0200
+++ new/yast2-update-2.16.7/src/clients/update_proposal.ycp 2008-04-23 15:39:22.000000000 +0200
@@ -5,7 +5,7 @@
*
* Purpose: Let user choose update settings.
*
- * $Id: update_proposal.ycp 46444 2008-04-11 16:06:05Z locilka $
+ * $Id: update_proposal.ycp 46991 2008-04-23 13:36:46Z locilka $
*/
{
textdomain "update";
@@ -323,6 +323,8 @@
Packages::SelectProduct();
Pkg::ActivateSelections (); // now go through all selected selections and select their packages
+ // bnc #382208
+ SelectKernelPackages ();
// FATE #301990, Bugzilla #238488
// Control the upgrade process better
@@ -331,7 +333,6 @@
y2milestone ("Update summary: %1", update_sum);
Update::unknown_packages = update_sum[`ProblemListSze]:0;
- SelectKernelPackages ();
list<string> sys_patterns = Packages::ComputeSystemPatternList ();
foreach (string pat, sys_patterns, {
Pkg::ResolvableInstall (pat, `pattern);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.16.6/src/clients/update.ycp new/yast2-update-2.16.7/src/clients/update.ycp
--- old/yast2-update-2.16.6/src/clients/update.ycp 2008-04-11 18:44:37.000000000 +0200
+++ new/yast2-update-2.16.7/src/clients/update.ycp 2008-04-23 15:36:04.000000000 +0200
@@ -6,20 +6,15 @@
* Arvin Schnell
* Lukas Ocilka
*
- * $Id: update.ycp 46452 2008-04-11 16:43:06Z locilka $
+ * $Id: update.ycp 46990 2008-04-23 13:33:28Z locilka $
*/
{
textdomain "update";
- import "Mode";
- import "Update";
- import "Wizard";
- import "ProductControl";
- import "Label";
- import "Mode";
import "GetInstArgs";
import "CommandLine";
+ import "Mode";
// Bugzilla #269910, CommanLine "support"
// argmap is only a map, CommandLine uses string parameters
@@ -31,33 +26,9 @@
return `auto;
}
- // somewhere, DirInstall is imported that wants Pkg in the constructor
- import "PackageLock";
- // check whether having the packager for ourselves
- if (! PackageLock::Check ())
- return `abort;
-
- // set normal mode and update
- Mode::SetMode ("update");
-
- Update::disallow_upgrade = true;
- Update::onlyUpdateInstalled = true;
- Update::deleteOldPackages = false;
-
- ProductControl::custom_control_file = "/usr/share/YaST2/control/update.xml";
-
- Wizard::OpenNextBackStepsDialog();
- Wizard::SetNextButton(`next, _("&Update"));
- if (!ProductControl::Init())
- {
- y2error("control file %1 not found", ProductControl::custom_control_file );
- }
- list<map> stage_mode = [$["stage": "normal", "mode": Mode::mode() ]];
- ProductControl::AddWizardSteps(stage_mode);
-
- symbol ret = ProductControl::Run();
-
- Wizard::CloseDialog ();
+ y2milestone ("Running: run_update");
+ symbol ret = (symbol) WFM::CallFunction ("run_update", WFM::Args());
+ y2milestone ("Returned: %1", ret);
- return `next;
+ return ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.16.6/VERSION new/yast2-update-2.16.7/VERSION
--- old/yast2-update-2.16.6/VERSION 2008-04-14 13:14:32.000000000 +0200
+++ new/yast2-update-2.16.7/VERSION 2008-04-23 15:40:12.000000000 +0200
@@ -1 +1 @@
-2.16.6
+2.16.7
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org