Hello community, here is the log from the commit of package yast2-product-creator for openSUSE:Factory checked in at 2012-06-29 07:04:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-product-creator/yast2-product-creator.changes 2012-04-12 10:00:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-product-creator.new/yast2-product-creator.changes 2012-06-29 07:04:29.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jun 28 14:43:19 CEST 2012 - [email protected] + +- enable forcing package version to be present in the product + (bnc#767614) +- 2.22.7 + +------------------------------------------------------------------- Old: ---- yast2-product-creator-2.22.6.tar.bz2 New: ---- yast2-product-creator-2.22.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-product-creator.spec ++++++ --- /var/tmp/diff_new_pack.VZ3WUP/_old 2012-06-29 07:04:31.000000000 +0200 +++ /var/tmp/diff_new_pack.VZ3WUP/_new 2012-06-29 07:04:31.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-product-creator -Version: 2.22.6 +Version: 2.22.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-product-creator-2.22.6.tar.bz2 -> yast2-product-creator-2.22.7.tar.bz2 ++++++ ++++ 2462 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-product-creator-2.22.6/VERSION new/yast2-product-creator-2.22.7/VERSION --- old/yast2-product-creator-2.22.6/VERSION 2012-04-03 11:08:56.000000000 +0200 +++ new/yast2-product-creator-2.22.7/VERSION 2012-06-28 14:40:49.000000000 +0200 @@ -1 +1 @@ -2.22.6 +2.22.7 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-product-creator-2.22.6/configure.in new/yast2-product-creator-2.22.7/configure.in --- old/yast2-product-creator-2.22.6/configure.in 2012-03-30 11:26:54.000000000 +0200 +++ new/yast2-product-creator-2.22.7/configure.in 2012-06-28 14:46:30.000000000 +0200 @@ -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.5, http://bugs.opensuse.org/, yast2-product-creator) +AC_INIT(yast2-product-creator, 2.22.7, 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.5" +VERSION="2.22.7" RPMNAME="yast2-product-creator" MAINTAINER="Jiri Suchomel <[email protected]>" 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-product-creator-2.22.6/src/Kiwi.ycp new/yast2-product-creator-2.22.7/src/Kiwi.ycp --- old/yast2-product-creator-2.22.6/src/Kiwi.ycp 2012-03-29 15:44:06.000000000 +0200 +++ new/yast2-product-creator-2.22.7/src/Kiwi.ycp 2012-06-28 14:39:56.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Data for kiwi configuration, input and output functions. * Authors: Jiri Suchomel <[email protected]> * - * $Id: Kiwi.ycp 67585 2012-03-07 15:32:12Z jsuchome $ + * $Id$ */ { module "Kiwi"; 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-product-creator-2.22.6/src/ProductCreator.ycp new/yast2-product-creator-2.22.7/src/ProductCreator.ycp --- old/yast2-product-creator-2.22.6/src/ProductCreator.ycp 2012-03-29 15:44:06.000000000 +0200 +++ new/yast2-product-creator-2.22.7/src/ProductCreator.ycp 2012-06-28 14:42:07.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Data for configuration of product-creator, input and output functions. * Authors: Anas Nashif <[email protected]> * - * $Id: ProductCreator.ycp 67277 2012-01-25 09:17:44Z jsuchome $ + * $Id$ * * Representation of the configuration of product-creator. * Input and output routines. @@ -216,7 +216,6 @@ } - /** * Data was modified? */ @@ -2840,11 +2839,17 @@ list<string> failed = []; toCopy = $[]; + + map<string,string> versions = listmap (map p, Config["package_versions"]:[], { + return $[ p["name"]:"" : p["version"]:"" ]; + }); + foreach(string package, selectedPackages, ``{ - list<map> package_data_list = Pkg::ResolvableProperties(package, `package, ""); - map package_data = package_data_list[0]:$[]; + string version = versions[package]:""; + list<map> package_data_list = Pkg::ResolvableProperties(package, `package, version); + map package_data = package_data_list[0]:$[]; if (package_data == nil || package_data == $[]) { failed = add (failed, package); @@ -2853,6 +2858,16 @@ { y2debug("package_data: %1", package_data); string arch = package_data["arch"]:"noarch"; + // find the package with correct version + if (version != "") + { + package_data = $[]; + foreach (map data, package_data_list, { + if (data["arch"]:"" == arch && data["version"]:"" == version) + package_data = data; + }); + } + integer src = package_data["source"]:-1; integer medianr = package_data["medium_nr"]:1; 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-product-creator-2.22.6/src/commandline.ycp new/yast2-product-creator-2.22.7/src/commandline.ycp --- old/yast2-product-creator-2.22.6/src/commandline.ycp 2012-03-29 15:44:06.000000000 +0200 +++ new/yast2-product-creator-2.22.7/src/commandline.ycp 2012-06-28 14:39:56.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Dialogs definitions * Authors: Ladislav Slezak <[email protected]> * - * $Id: commandline.ycp 67277 2012-01-25 09:17:44Z jsuchome $ + * $Id$ */ { 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-product-creator-2.22.6/src/complex.ycp new/yast2-product-creator-2.22.7/src/complex.ycp --- old/yast2-product-creator-2.22.6/src/complex.ycp 2012-03-29 15:44:06.000000000 +0200 +++ new/yast2-product-creator-2.22.7/src/complex.ycp 2012-06-28 14:39:56.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Dialogs definitions * Authors: Anas Nashif <[email protected]> * - * $Id: complex.ycp 67277 2012-01-25 09:17:44Z jsuchome $ + * $Id$ */ { 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-product-creator-2.22.6/src/dialogs.ycp new/yast2-product-creator-2.22.7/src/dialogs.ycp --- old/yast2-product-creator-2.22.6/src/dialogs.ycp 2012-03-29 15:44:06.000000000 +0200 +++ new/yast2-product-creator-2.22.7/src/dialogs.ycp 2012-06-28 14:43:12.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Dialogs definitions * Authors: Anas Nashif <[email protected]> * - * $Id: dialogs.ycp 67277 2012-01-25 09:17:44Z jsuchome $ + * $Id$ */ { @@ -111,7 +111,37 @@ } - + /** + * Select package for installation. If package itself is not available, find package providing it + * If version is not empty, select specific package version + */ + boolean InstallPackageOrProviderVersion (string p, string version) { + + y2internal ("p %1, version '%2'", p, version); + boolean selected = (version == "") ? + Pkg::PkgInstall(p) : + Pkg::ResolvableInstallArchVersion (p, `package, ProductCreator::GetArch(), version); + + 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)); + } + } + + } + + boolean InstallPackageOrProvider (string p) { + return InstallPackageOrProviderVersion (p, ""); + } + /** * General configuration dialog @@ -1157,9 +1187,22 @@ if (size(ProductCreator::Config["packages"]:[] ) > 0) { + map<string,string> versions = listmap (map p, ProductCreator::Config["package_versions"]:[], { + return $[ p["name"]:"" : p["version"]:"" ]; + }); + foreach(string p, ProductCreator::Config["packages"]:[], ``{ - y2milestone("selecting package for installation: %1 -> %2", p, Pkg::PkgInstall(p)); - }); + string version = versions[p]:""; + if (version != "") + { + y2milestone("selecting package for installation: %1 (%2) -> %3", + p, version, InstallPackageOrProviderVersion (p, version)); + } + else + { + y2milestone("selecting package for installation: %1 -> %2", p, Pkg::PkgInstall(p)); + } + }); } // mark taboo packages @@ -1264,37 +1307,14 @@ return result; } - boolean InstallPackageOrProvider (string 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)); - } - } - - } - /** * Display package selection dialog with preselected packages. - * @param base_pattern base pattern to install, can be empty ("") if there is no base pattern - * @param patterns list of patterns to install - * @param packages list of packages to install - * @param taboo list of packages marked as taboo - * @param mode UI mode selection, use `packages for detailed package selection or `patterns for pattern selection. - * @return map<string,any> + * See runPackageSelector + * @param versions map of specific package versions that need to be selected */ - map<string,any> runPackageSelector(string base_pattern, list<string> patterns, list<string> packages, list<string> taboo, symbol mode) + map<string,any> runPackageSelectorVersions (string base_pattern, list<string> patterns, list<string> packages, map<string,string> versions, list<string> taboo, symbol mode) { - y2milestone("running package selector: base_pattern: %1, patterns: %2, packages: %3, taboo: %4, mode: %5", base_pattern, patterns, packages, taboo, mode); + y2milestone("running package selector: base_pattern: %1, patterns: %2, packages: %3, versions: %4 taboo: %5, mode: %6", base_pattern, patterns, packages, versions, taboo, mode); any ret = nil; @@ -1365,7 +1385,7 @@ { foreach(string p, packages, { - InstallPackageOrProvider (p); + InstallPackageOrProviderVersion (p, versions[p]:""); }); } @@ -1466,6 +1486,21 @@ } /** + * Display package selection dialog with preselected packages. + * @param base_pattern base pattern to install, can be empty ("") if there is no base pattern + * @param patterns list of patterns to install + * @param packages list of packages to install + * @param taboo list of packages marked as taboo + * @param mode UI mode selection, use `packages for detailed package selection or `patterns for pattern selection. + * @return map<string,any> + */ + map<string,any> runPackageSelector(string base_pattern, list<string> patterns, list<string> packages, list<string> taboo, symbol mode) + + { + return runPackageSelectorVersions (base_pattern, patterns, packages, $[], taboo, mode); + } + + /** * Select packages * @return symbol */ @@ -1480,7 +1515,11 @@ list<string> packages = ProductCreator::Config["packages"]:[]; list<string> taboo = ProductCreator::Config["taboo"]:[]; - result = runPackageSelector(base_pattern, patterns, packages, taboo, `patterns); + map<string,string> versions = listmap (map p, ProductCreator::Config["package_versions"]:[], { + return $[ p["name"]:"" : p["version"]:"" ]; + }); + + result = runPackageSelectorVersions(base_pattern, patterns, packages, versions, taboo, `patterns); y2debug("Package selector result: %1", result); 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-product-creator-2.22.6/src/helps.ycp new/yast2-product-creator-2.22.7/src/helps.ycp --- old/yast2-product-creator-2.22.6/src/helps.ycp 2012-03-29 15:44:06.000000000 +0200 +++ new/yast2-product-creator-2.22.7/src/helps.ycp 2012-06-28 14:39:56.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Help texts of all the dialogs * Authors: Anas Nashif <[email protected]> * - * $Id: helps.ycp 67277 2012-01-25 09:17:44Z jsuchome $ + * $Id$ */ { 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-product-creator-2.22.6/src/image-creator.ycp new/yast2-product-creator-2.22.7/src/image-creator.ycp --- old/yast2-product-creator-2.22.6/src/image-creator.ycp 2012-03-29 15:44:06.000000000 +0200 +++ new/yast2-product-creator-2.22.7/src/image-creator.ycp 2012-06-28 14:39:56.000000000 +0200 @@ -19,7 +19,7 @@ */ /** - * $Id: image-creator.ycp 67277 2012-01-25 09:17:44Z jsuchome $ + * $Id$ * */ 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-product-creator-2.22.6/src/kiwi.ycp new/yast2-product-creator-2.22.7/src/kiwi.ycp --- old/yast2-product-creator-2.22.6/src/kiwi.ycp 2012-03-29 15:44:06.000000000 +0200 +++ new/yast2-product-creator-2.22.7/src/kiwi.ycp 2012-06-28 14:39:56.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Client to start the kiwi UI * Authors: Jiri Suchomel <[email protected]> * - * $Id: kiwi.ycp 67277 2012-01-25 09:17:44Z jsuchome $ + * $Id$ * */ 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-product-creator-2.22.6/src/kiwi_dialogs.ycp new/yast2-product-creator-2.22.7/src/kiwi_dialogs.ycp --- old/yast2-product-creator-2.22.6/src/kiwi_dialogs.ycp 2012-04-03 11:08:15.000000000 +0200 +++ new/yast2-product-creator-2.22.7/src/kiwi_dialogs.ycp 2012-06-28 14:39:56.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Dialogs for kiwi configuration * Authors: Jiri Suchomel <[email protected]> * - * $Id: kiwi_dialogs.ycp 67680 2012-03-21 13:54:03Z jsuchome $ + * $Id$ */ { textdomain "product-creator"; 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-product-creator-2.22.6/src/product-creator.ycp new/yast2-product-creator-2.22.7/src/product-creator.ycp --- old/yast2-product-creator-2.22.6/src/product-creator.ycp 2012-03-29 15:44:06.000000000 +0200 +++ new/yast2-product-creator-2.22.7/src/product-creator.ycp 2012-06-28 14:39:56.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Main file * Authors: Anas Nashif <[email protected]> * - * $Id: product-creator.ycp 67277 2012-01-25 09:17:44Z jsuchome $ + * $Id$ * * Main file for product-creator configuration. Uses all other files. */ 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-product-creator-2.22.6/src/routines.ycp new/yast2-product-creator-2.22.7/src/routines.ycp --- old/yast2-product-creator-2.22.6/src/routines.ycp 2012-01-25 10:17:45.000000000 +0100 +++ new/yast2-product-creator-2.22.7/src/routines.ycp 2012-06-28 14:39:56.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Miscelanous functions for configuration of product-creator. * Authors: Anas Nashif <[email protected]> * - * $Id: routines.ycp 67277 2012-01-25 09:17:44Z jsuchome $ + * $Id$ */ { 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-product-creator-2.22.6/src/wizards.ycp new/yast2-product-creator-2.22.7/src/wizards.ycp --- old/yast2-product-creator-2.22.6/src/wizards.ycp 2012-03-29 15:44:06.000000000 +0200 +++ new/yast2-product-creator-2.22.7/src/wizards.ycp 2012-06-28 14:39:56.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Wizards definitions * Authors: Anas Nashif <[email protected]> * - * $Id: wizards.ycp 67277 2012-01-25 09:17:44Z jsuchome $ + * $Id$ */ { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
