Hello community,
here is the log from the commit of package yast2-packager
checked in at Sat Jun 3 01:03:12 CEST 2006.
--------
--- yast2-packager/yast2-packager.changes 2006-06-02 11:20:51.000000000 +0200
+++ yast2-packager/yast2-packager.changes 2006-06-02 16:30:31.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Jun 2 16:09:05 CEST 2006 - lslezak@suse.cz
+
+- run the solver after selecting a Xen kernel (#178306)
+- fixes in SourceManager module (nil check, infinite loops)
+- 2.13.125
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.13.124.tar.bz2
New:
----
yast2-packager-2.13.125.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.5VJwvb/_old 2006-06-03 01:02:16.000000000 +0200
+++ /var/tmp/diff_new_pack.5VJwvb/_new 2006-06-03 01:02:16.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.13.124)
+# spec file for package yast2-packager (Version 2.13.125)
#
# 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.124
+Version: 2.13.125
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.13.124.tar.bz2
+Source0: yast2-packager-2.13.125.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 yast2-installation checkmedia yast2-country
@@ -43,7 +43,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.13.124
+%setup -n yast2-packager-2.13.125
%build
%{prefix}/bin/y2tool y2autoconf
@@ -80,6 +80,10 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog -n yast2-packager
+* Fri Jun 02 2006 - lslezak@suse.cz
+- run the solver after selecting a Xen kernel (#178306)
+- fixes in SourceManager module (nil check, infinite loops)
+- 2.13.125
* Fri Jun 02 2006 - jsrain@suse.cz
- log Report messages by default (bug 180862)
- 2.13.124
++++++ yast2-packager-2.13.124.tar.bz2 -> yast2-packager-2.13.125.tar.bz2 ++++++
++++ 2806 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.124/VERSION new/yast2-packager-2.13.125/VERSION
--- old/yast2-packager-2.13.124/VERSION 2006-06-02 11:07:24.000000000 +0200
+++ new/yast2-packager-2.13.125/VERSION 2006-06-02 16:12:15.000000000 +0200
@@ -1 +1 @@
-2.13.124
+2.13.125
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.124/configure.in new/yast2-packager-2.13.125/configure.in
--- old/yast2-packager-2.13.124/configure.in 2006-06-02 11:18:30.000000000 +0200
+++ new/yast2-packager-2.13.125/configure.in 2006-06-02 16:29:06.000000000 +0200
@@ -3,7 +3,7 @@
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.124, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.13.125, 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.124"
+VERSION="2.13.125"
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.124/src/modules/Packages.ycp new/yast2-packager-2.13.125/src/modules/Packages.ycp
--- old/yast2-packager-2.13.124/src/modules/Packages.ycp 2006-06-01 10:08:44.000000000 +0200
+++ new/yast2-packager-2.13.125/src/modules/Packages.ycp 2006-06-02 16:18:48.000000000 +0200
@@ -3,7 +3,7 @@
* Package: Package selections
* Authors: Anas Nashif
*
- * $Id: Packages.ycp 31221 2006-06-01 08:08:41Z jsrain $
+ * $Id: Packages.ycp 31293 2006-06-02 14:18:41Z lslezak $
*/
{
@@ -1252,8 +1252,13 @@
if (xen_selected)
{
+ // run the solver if a package is selected
+ boolean run_solver = false;
+
if (contains (Kernel::GetPackages (), "kernel-bigsmp"))
{
+ run_solver = !Pkg::IsSelected("kernel-xenpae");
+
y2milestone("Selected Xen kernel: kernel-xenpae");
// install PAE Xen
Pkg::PkgNeutral("kernel-xen");
@@ -1261,11 +1266,19 @@
}
else
{
+ run_solver = !Pkg::IsSelected("kernel-xen");
+
y2milestone("Selected Xen kernel: kernel-xen");
// install standard Xen
Pkg::PkgNeutral("kernel-xenpae");
Pkg::PkgInstall("kernel-xen");
}
+
+ y2milestone("run_solver: %1", run_solver);
+ if (run_solver)
+ {
+ Pkg::PkgSolve(true);
+ }
}
y2milestone ("proposal %1", output);
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.124/src/modules/SourceManager.ycp new/yast2-packager-2.13.125/src/modules/SourceManager.ycp
--- old/yast2-packager-2.13.124/src/modules/SourceManager.ycp 2006-05-15 13:28:31.000000000 +0200
+++ new/yast2-packager-2.13.125/src/modules/SourceManager.ycp 2006-06-02 16:18:48.000000000 +0200
@@ -7,7 +7,7 @@
* Martin Vidner
* Status: Work in Progress
*
- * $Id: SourceManager.ycp 30898 2006-05-12 14:11:48Z mvidner $
+ * $Id: SourceManager.ycp 31293 2006-06-02 14:18:41Z lslezak $
*
* Representation of the configuration of source-manager.
* Input and output routines.
@@ -425,7 +425,9 @@
{
id = sourceStatesOut[i, "SrcId"]:-1;
break;
- }
+ }
+
+ i = i + 1;
}
return id;
@@ -443,6 +445,11 @@
map g = Pkg::SourceGeneralData( source );
y2milestone("generalData: %1", g);
map p = Pkg::SourceProductData( source );
+ if (p == nil)
+ {
+ p = $[];
+ }
+
y2milestone("productData: %1", p);
return ((map)union(g,p));
}
@@ -541,6 +548,8 @@
sourceStatesOut = remove( sourceStatesOut, i );
break;
}
+
+ i = i + 1;
}
return;
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.124/src/modules/test.ycp new/yast2-packager-2.13.125/src/modules/test.ycp
--- old/yast2-packager-2.13.124/src/modules/test.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-packager-2.13.125/src/modules/test.ycp 2005-11-02 13:29:02.000000000 +0100
@@ -0,0 +1,58 @@
+
+{
+ import "Package";
+ import "CommandLine";
+
+ textdomain "test";
+
+ boolean startHandler(map opts) {
+ Package::InstallAll(["samba-doc", "qt3-devel-doc"]);
+// Package::InstallAll(["sambadocdfdfdf"]);
+
+ return true;
+ }
+
+ symbol GUIhandler() {
+ y2milestone("GUIhandler");
+ return `next;
+ }
+
+ boolean Read() {
+ return true;
+ }
+
+ boolean Write() {
+ return true;
+ }
+
+ map cmdline = $[
+ // help text
+ "help" : _("Start installation in a virtual machine"),
+ "id" : "vm",
+ "guihandler": GUIhandler,
+ "initialize": Read,
+ "finish" : Write,
+ "actions" : $[
+ "start" : $[
+ // command description
+ "help" : _("Start installation"),
+ "handler" : startHandler
+ ]
+ ],
+ "options" : $[
+ "configured" : $[
+ // option description
+ "help" : _("List only configured devices")
+ ],
+ "all" : $[
+ // option description
+ "help" : _("List all detected IDE devices")
+ ]
+ ],
+ "mappings" : $[
+ "start" : ["configured", "all"],
+ ]
+ ];
+
+ any ret = CommandLine::Run(cmdline);
+}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org