Hello community,
here is the log from the commit of package yast2-product-creator for openSUSE:Factory
checked in at Wed Jan 27 18:12:34 CET 2010.
--------
--- yast2-product-creator/yast2-product-creator.changes 2010-01-06 14:21:30.000000000 +0100
+++ yast2-product-creator/yast2-product-creator.changes 2010-01-25 20:03:32.000000000 +0100
@@ -1,0 +2,16 @@
+Mon Jan 25 19:41:02 CET 2010 - jsuchome@suse.cz
+
+- when package cannot be installed, look if it is not provided
+ by something else (bnc#571694)
+- if primary tag for the boot images is not defined, take the first
+ one (bnc#572727)
+- 2.19.2
+
+------------------------------------------------------------------
+Wed Jan 13 18:56:03 CET 2010 - kmachalkova@suse.cz
+
+- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su
+ where root privileges are needed, removed X-KDE-SubstituteUID key
+ (bnc#540627)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-product-creator-2.19.1.tar.bz2
New:
----
yast2-product-creator-2.19.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-product-creator.spec ++++++
--- /var/tmp/diff_new_pack.lNHxXV/_old 2010-01-27 18:11:13.000000000 +0100
+++ /var/tmp/diff_new_pack.lNHxXV/_new 2010-01-27 18:11:13.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-product-creator (Version 2.19.1)
+# spec file for package yast2-product-creator (Version 2.19.2)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,10 +19,10 @@
Name: yast2-product-creator
-Version: 2.19.1
+Version: 2.19.2
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-product-creator-2.19.1.tar.bz2
+Source0: yast2-product-creator-2.19.2.tar.bz2
Prefix: /usr
Group: System/YaST
License: GPLv2+
@@ -47,7 +47,7 @@
XEN images etc.), based on existing installation sources.
%prep
-%setup -n yast2-product-creator-2.19.1
+%setup -n yast2-product-creator-2.19.2
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-product-creator-2.19.1.tar.bz2 -> yast2-product-creator-2.19.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.1/VERSION new/yast2-product-creator-2.19.2/VERSION
--- old/yast2-product-creator-2.19.1/VERSION 2010-01-06 13:53:51.000000000 +0100
+++ new/yast2-product-creator-2.19.2/VERSION 2010-01-25 19:41:31.000000000 +0100
@@ -1 +1 @@
-2.19.1
+2.19.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.1/configure new/yast2-product-creator-2.19.2/configure
--- old/yast2-product-creator-2.19.1/configure 2010-01-06 14:19:08.000000000 +0100
+++ new/yast2-product-creator-2.19.2/configure 2010-01-25 19:41:45.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-product-creator 2.19.1.
+# Generated by GNU Autoconf 2.63 for yast2-product-creator 2.19.2.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-product-creator'
PACKAGE_TARNAME='yast2-product-creator'
-PACKAGE_VERSION='2.19.1'
-PACKAGE_STRING='yast2-product-creator 2.19.1'
+PACKAGE_VERSION='2.19.2'
+PACKAGE_STRING='yast2-product-creator 2.19.2'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1274,7 +1274,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.19.1 to adapt to many kinds of systems.
+\`configure' configures yast2-product-creator 2.19.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1346,7 +1346,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-product-creator 2.19.1:";;
+ short | recursive ) echo "Configuration of yast2-product-creator 2.19.2:";;
esac
cat <<\_ACEOF
@@ -1426,7 +1426,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-product-creator configure 2.19.1
+yast2-product-creator configure 2.19.2
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1440,7 +1440,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.19.1, which was
+It was created by yast2-product-creator $as_me 2.19.2, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2420,7 +2420,7 @@
# Define the identity of the package.
PACKAGE='yast2-product-creator'
- VERSION='2.19.1'
+ VERSION='2.19.2'
cat >>confdefs.h <<_ACEOF
@@ -2542,7 +2542,7 @@
-VERSION="2.19.1"
+VERSION="2.19.2"
RPMNAME="yast2-product-creator"
MAINTAINER="Jiri Suchomel "
@@ -3484,7 +3484,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.19.1, which was
+This file was extended by yast2-product-creator $as_me 2.19.2, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3534,7 +3534,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-product-creator config.status 2.19.1
+yast2-product-creator config.status 2.19.2
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.1/configure.in new/yast2-product-creator-2.19.2/configure.in
--- old/yast2-product-creator-2.19.1/configure.in 2010-01-06 14:19:04.000000000 +0100
+++ new/yast2-product-creator-2.19.2/configure.in 2010-01-25 19:41:40.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-product-creator, 2.19.1, http://bugs.opensuse.org/, yast2-product-creator)
+AC_INIT(yast2-product-creator, 2.19.2, 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.19.1"
+VERSION="2.19.2"
RPMNAME="yast2-product-creator"
MAINTAINER="Jiri Suchomel "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.1/src/dialogs.ycp new/yast2-product-creator-2.19.2/src/dialogs.ycp
--- old/yast2-product-creator-2.19.1/src/dialogs.ycp 2009-12-22 15:49:36.000000000 +0100
+++ new/yast2-product-creator-2.19.2/src/dialogs.ycp 2010-01-25 19:38:09.000000000 +0100
@@ -1342,7 +1342,20 @@
{
foreach(string p, packages,
{
- y2milestone("selecting package for installation: %1 -> %2", p, Pkg::PkgInstall(p));
+ boolean selected = Pkg::PkgInstall(p);
+ y2milestone("selecting package for installation: %1 -> %2", p, selected);
+ if (!selected)
+ {
+ list <list> provides = Pkg::PkgQueryProvides (p);
+ provides = filter (list l, provides, {
+ return l[1]:`NONE != `NONE;
+ });
+ string pp = provides[0,0]:"";
+ if (pp != "")
+ {
+ y2milestone("selecting first package providing %1: %2 -> %3", p, pp, Pkg::PkgInstall (pp));
+ }
+ }
});
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.1/src/image-creator.desktop new/yast2-product-creator-2.19.2/src/image-creator.desktop
--- old/yast2-product-creator-2.19.1/src/image-creator.desktop 2009-09-03 14:16:19.000000000 +0200
+++ new/yast2-product-creator-2.19.2/src/image-creator.desktop 2010-01-15 09:17:31.000000000 +0100
@@ -17,9 +17,8 @@
X-SuSE-YaST-Keywords=product,appliance,kiwi
Icon=yast-kiwi
-Exec=/sbin/yast2 image-creator
+Exec=xdg-su -c "/sbin/yast2 image-creator"
Name=Image Creator
GenericName=Create the Live CD, USB or XEN image
-X-KDE-SubstituteUID=true
StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.1/src/kiwi_dialogs.ycp new/yast2-product-creator-2.19.2/src/kiwi_dialogs.ycp
--- old/yast2-product-creator-2.19.1/src/kiwi_dialogs.ycp 2010-01-06 14:18:55.000000000 +0100
+++ new/yast2-product-creator-2.19.2/src/kiwi_dialogs.ycp 2010-01-25 19:38:09.000000000 +0100
@@ -2075,14 +2075,12 @@
UI::ChangeWidget(`id(`out_dir), `Value, Config["iso-directory"]:"");
update_repo_table ();
list type_its = supported_images != "template" ? default_type_items: [];
- boolean primary = false;
+ kiwi_task = "";
foreach (map typemap, (list<map>) Config["preferences",0,"type"]:[], {
string type = typemap[content_key]:"";
- if (!primary)
+ if (typemap["primary"]:"false" == "true" || kiwi_task == "")
kiwi_task = type;
- if (typemap["primary"]:"false" == "true")
- primary = true;
if ((supported_images == "" && !contains (present_types, type)) ||
supported_images == "template")
{
@@ -2091,6 +2089,11 @@
present_types = union (present_types, [type]);
}
});
+ if (kiwi_task == "")
+ {
+ kiwi_task = "iso";
+ y2warning ("no task found, setting to 'iso'");
+ }
UI::ChangeWidget (`id (`type), `Items, type_its);
UI::ChangeWidget (`id (`type), `Value, kiwi_task);
return true;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.1/src/product-creator.desktop new/yast2-product-creator-2.19.2/src/product-creator.desktop
--- old/yast2-product-creator-2.19.1/src/product-creator.desktop 2009-09-03 14:16:42.000000000 +0200
+++ new/yast2-product-creator-2.19.2/src/product-creator.desktop 2010-01-15 09:17:31.000000000 +0100
@@ -17,9 +17,8 @@
X-SuSE-YaST-Keywords=product,repository
Icon=yast-cd-creator
-Exec=/sbin/yast2 product-creator
+Exec=xdg-su -c "/sbin/yast2 product-creator"
Name=Product Creator
GenericName=Create new products from existing repositories
-X-KDE-SubstituteUID=true
StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.1/src/routines.ycp new/yast2-product-creator-2.19.2/src/routines.ycp
--- old/yast2-product-creator-2.19.1/src/routines.ycp 2008-12-18 14:46:59.000000000 +0100
+++ new/yast2-product-creator-2.19.2/src/routines.ycp 2010-01-25 19:38:09.000000000 +0100
@@ -38,12 +38,20 @@
// get the primary value of image type to be built ('type' from 'preferences')
string get_current_task (map config) {
- string task = "iso";
+ string task = "";
foreach (map typemap, (list<map>) config["preferences",0,"type"]:[], {
- task = typemap[Kiwi::content_key]:task;
+ if (task == "") // take the 1st one if none is default
+ task = typemap[Kiwi::content_key]:task;
if (typemap["primary"]:"false" == "true")
+ {
+ task = typemap[Kiwi::content_key]:task;
break;
+ }
});
+ if (task == "")
+ {
+ y2milestone ("no task found, setting to 'iso'");
+ }
return task;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org