Hello community,
here is the log from the commit of package yast2-product-creator for
openSUSE:Factory checked in at 2012-03-07 13:46:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-product-creator (Old)
and /work/SRC/openSUSE:Factory/.yast2-product-creator.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-product-creator", Maintainer is "jsuch...@suse.com"
Changes:
--------
---
/work/SRC/openSUSE:Factory/yast2-product-creator/yast2-product-creator.changes
2012-02-22 16:36:55.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-product-creator.new/yast2-product-creator.changes
2012-03-07 13:46:27.000000000 +0100
@@ -1,0 +2,7 @@
+Wed Mar 7 09:18:05 CET 2012 - jsuch...@suse.cz
+
+- new check for conflicting delete packages (bnc#748488)
+- allow writing empty package list (bnc#749029)
+- 2.22.3
+
+-------------------------------------------------------------------
Old:
----
yast2-product-creator-2.22.2.tar.bz2
New:
----
yast2-product-creator-2.22.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-product-creator.spec ++++++
--- /var/tmp/diff_new_pack.NxBGRm/_old 2012-03-07 13:46:29.000000000 +0100
+++ /var/tmp/diff_new_pack.NxBGRm/_new 2012-03-07 13:46:29.000000000 +0100
@@ -18,7 +18,7 @@
Name: yast2-product-creator
-Version: 2.22.2
+Version: 2.22.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-product-creator-2.22.2.tar.bz2 ->
yast2-product-creator-2.22.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-2.22.2/VERSION
new/yast2-product-creator-2.22.3/VERSION
--- old/yast2-product-creator-2.22.2/VERSION 2012-02-22 13:20:18.000000000
+0100
+++ new/yast2-product-creator-2.22.3/VERSION 2012-03-07 09:18:23.000000000
+0100
@@ -1 +1 @@
-2.22.2
+2.22.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-2.22.2/configure
new/yast2-product-creator-2.22.3/configure
--- old/yast2-product-creator-2.22.2/configure 2012-02-22 13:20:27.000000000
+0100
+++ new/yast2-product-creator-2.22.3/configure 2012-03-07 09:18:59.000000000
+0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for yast2-product-creator 2.22.2.
+# Generated by GNU Autoconf 2.68 for yast2-product-creator 2.22.3.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-product-creator'
PACKAGE_TARNAME='yast2-product-creator'
-PACKAGE_VERSION='2.22.2'
-PACKAGE_STRING='yast2-product-creator 2.22.2'
+PACKAGE_VERSION='2.22.3'
+PACKAGE_STRING='yast2-product-creator 2.22.3'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1229,7 +1229,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-product-creator 2.22.2 to adapt to many kinds of
systems.
+\`configure' configures yast2-product-creator 2.22.3 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1301,7 +1301,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-product-creator
2.22.2:";;
+ short | recursive ) echo "Configuration of yast2-product-creator
2.22.3:";;
esac
cat <<\_ACEOF
@@ -1381,7 +1381,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-product-creator configure 2.22.2
+yast2-product-creator configure 2.22.3
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1398,7 +1398,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-product-creator $as_me 2.22.2, which was
+It was created by yast2-product-creator $as_me 2.22.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2328,7 +2328,7 @@
# Define the identity of the package.
PACKAGE='yast2-product-creator'
- VERSION='2.22.2'
+ VERSION='2.22.3'
cat >>confdefs.h <<_ACEOF
@@ -2450,7 +2450,7 @@
-VERSION="2.22.2"
+VERSION="2.22.3"
RPMNAME="yast2-product-creator"
MAINTAINER="Jiri Suchomel <jsuch...@suse.cz>"
@@ -3380,7 +3380,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-product-creator $as_me 2.22.2, which was
+This file was extended by yast2-product-creator $as_me 2.22.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3433,7 +3433,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-product-creator config.status 2.22.2
+yast2-product-creator config.status 2.22.3
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-2.22.2/configure.in
new/yast2-product-creator-2.22.3/configure.in
--- old/yast2-product-creator-2.22.2/configure.in 2012-02-22
13:20:22.000000000 +0100
+++ new/yast2-product-creator-2.22.3/configure.in 2012-03-07
09:18:54.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.21.8 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-product-creator, 2.22.2, http://bugs.opensuse.org/,
yast2-product-creator)
+AC_INIT(yast2-product-creator, 2.22.3, http://bugs.opensuse.org/,
yast2-product-creator)
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.22.2"
+VERSION="2.22.3"
RPMNAME="yast2-product-creator"
MAINTAINER="Jiri Suchomel <jsuch...@suse.cz>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-2.22.2/src/Kiwi.ycp
new/yast2-product-creator-2.22.3/src/Kiwi.ycp
--- old/yast2-product-creator-2.22.2/src/Kiwi.ycp 2012-02-22
08:01:15.000000000 +0100
+++ new/yast2-product-creator-2.22.3/src/Kiwi.ycp 2012-02-27
15:46:32.000000000 +0100
@@ -24,7 +24,7 @@
* Summary: Data for kiwi configuration, input and output functions.
* Authors: Jiri Suchomel <jsuch...@suse.cz>
*
- * $Id: Kiwi.ycp 67277 2012-01-25 09:17:44Z jsuchome $
+ * $Id: Kiwi.ycp 67511 2012-02-22 12:25:45Z jsuchome $
*/
{
module "Kiwi";
@@ -417,7 +417,6 @@
size (packagemap["package"]:[]) == 0)
{
y2milestone ("no patterns/packages in %1", packagemap);
- return;
}
image_contents = image_contents +
MapAny2XML ("packages", packagemap, 1) + "\n";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-2.22.2/src/kiwi_dialogs.ycp
new/yast2-product-creator-2.22.3/src/kiwi_dialogs.ycp
--- old/yast2-product-creator-2.22.2/src/kiwi_dialogs.ycp 2012-02-22
08:03:52.000000000 +0100
+++ new/yast2-product-creator-2.22.3/src/kiwi_dialogs.ycp 2012-03-06
17:30:40.000000000 +0100
@@ -24,7 +24,7 @@
* Summary: Dialogs for kiwi configuration
* Authors: Jiri Suchomel <jsuch...@suse.cz>
*
- * $Id: kiwi_dialogs.ycp 67277 2012-01-25 09:17:44Z jsuchome $
+ * $Id: kiwi_dialogs.ycp 67511 2012-02-22 12:25:45Z jsuchome $
*/
{
textdomain "product-creator";
@@ -382,9 +382,54 @@
}
/**
+ * check the conflicts between packages selected and marked for deletion
(fate#305254)
+ * @param packages_before map of packages already selected before entering
package selector
+ */
+ define boolean CheckForDeletedPackages (map packages_before) {
+
+ y2milestone ("checking list of selected packages...");
+ StoreSWDelete ("delete_sw", $[]);
+ map to_delete = $[];
+ foreach (map pmap, KiwiConfig["packages"]:[], {
+ string type = pmap["type"]:"";
+ if (type == "delete")
+ {
+ to_delete = listmap (map pacmap, pmap["package"]:[], ``(
+ $[ pacmap["name"]:"" : true ])
+ );
+ }
+ });
+ boolean conflicting = false;
+ if (size (to_delete) > 0)
+ {
+ foreach (map package, Pkg::ResolvableProperties("", `package, ""), {
+ if (conflicting)
+ break;
+ string name = package["name"]:"";
+ // only look at packages selected in last package selector run
+ if (package["status"]:nil == `selected && !haskey (packages_before,
name))
+ {
+ symbol transact_by = package["transact_by"]:`none;
+ if (transact_by == `solver || transact_by == `user ||
transact_by == `app_high)
+ {
+ if (haskey (to_delete, name))
+ {
+ y2milestone ("packege %1 selected by %2 is present in
the delete list",
+ name, transact_by);
+ conflicting = true;
+ }
+ }
+ }
+ });
+ }
+ return conflicting;
+ }
+
+ /**
* Handler for software selection
*/
define symbol HandleSWSelection (string key, map event) {
+
if (event["ID"]:nil == key)
{
integer package_set = KiwiConfig["package_set"]:0;
@@ -396,10 +441,12 @@
}
map sw_contents = KiwiConfig["packages",package_set]:$[];
+ map packages_before = $[];
// separate bootinclude packages from normal ones
list bi_packages = [];
sw_contents["package"] = filter (map p, sw_contents["package"]:[], {
+ packages_before[p["name"]:""] = true;
if (p["bootinclude"]:"" == "true")
bi_packages = add (bi_packages, p);
return p["bootinclude"]:"" != "true";
@@ -411,7 +458,18 @@
}
else
{
- sw_contents = modifyPackageSelection (sw_contents);
+ boolean again = true;
+ while (again)
+ {
+ sw_contents = modifyPackageSelection (sw_contents);
+ again = CheckForDeletedPackages (packages_before);
+ if (again && Popup::YesNo (_("Some of the packages that are
selected for installation
+are also included in the list for deletion.
+Continue anyway?")))
+ {
+ again = false;
+ }
+ }
}
if (sw_contents != nil && bi_packages != nil)
@@ -1308,6 +1366,7 @@
return ret;
}
+
/**
* handler for main action: create the iso image with kiwi
*/
@@ -1315,45 +1374,6 @@
if (event["ID"]:nil != `next)
return true;
- // check the conflicts between packages selected and marked for deletion
(fate#305254)
- y2milestone ("checking list of selected packages...");
- map to_delete = $[];
- foreach (map pmap, KiwiConfig["packages"]:[], {
- string type = pmap["type"]:"";
- if (type == "delete")
- {
- to_delete = listmap (map pacmap, pmap["package"]:[], ``(
- $[ pacmap["name"]:"" : true ])
- );
- }
- });
- boolean conflicting = false;
- if (size (to_delete) > 0)
- {
- foreach (map package, Pkg::ResolvableProperties("", `package, ""), {
- if (conflicting)
- break;
- if (package["status"]:nil == `selected)
- {
- symbol transact_by = package["transact_by"]:`none;
- string name = package["name"]:"";
- if (transact_by == `solver || transact_by == `user ||
transact_by == `app_high)
- {
- if (haskey (to_delete, name))
- {
- y2milestone ("packege %1 selected by %2 is present in
the delete list",
- name, transact_by);
- conflicting = true;
- }
- }
- }
- });
- }
- // yes/no popup
- if (conflicting && !Popup::YesNo (_("Some of the packages that are
selected for installation
-are also included in the list for deletion.
-Continue anyway?")))
- return false;
boolean ret = true;
map question = $[
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
