Hello community, here is the log from the commit of package autoyast2 checked in at Sat May 31 12:17:43 CEST 2008. -------- --- autoyast2/autoyast2.changes 2008-05-27 15:20:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/autoyast2/autoyast2.changes 2008-05-30 16:25:35.146539000 +0200 @@ -1,0 +2,7 @@ +Fri May 30 16:21:02 CEST 2008 - ug@suse.de + +- fix for cloning the software section + (bnc#391770) +- 2.16.18 + +------------------------------------------------------------------- Old: ---- autoyast2-2.16.17.tar.bz2 New: ---- autoyast2-2.16.18.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.r20423/_old 2008-05-31 12:17:31.000000000 +0200 +++ /var/tmp/diff_new_pack.r20423/_new 2008-05-31 12:17:31.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package autoyast2 (Version 2.16.17) +# spec file for package autoyast2 (Version 2.16.18) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,12 +13,12 @@ Url: http://www.suse.de/~ug Name: autoyast2 -Version: 2.16.17 +Version: 2.16.18 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: autoyast2-2.16.17.tar.bz2 +Source0: autoyast2-2.16.18.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets java2-devel-packages libxslt perl-XML-Writer pkg-config sgml-skel update-desktop-files xorg-x11-libs yast2-bootloader yast2-country yast2-devtools yast2-mouse yast2-testsuite yast2-transfer yast2-update # API for Disabled Modules (ProductControl) @@ -54,7 +54,7 @@ %package installation License: GPL v2 or later -Version: 2.16.17 +Version: 2.16.18 Release: 1 Summary: YaST2 - Auto Installation Modules Group: System/YaST @@ -76,7 +76,7 @@ Anas Nashif %prep -%setup -n autoyast2-2.16.17 +%setup -n autoyast2-2.16.18 %build %{prefix}/bin/y2tool y2autoconf @@ -216,6 +216,10 @@ %dir /var/lib/autoinstall %dir /var/lib/autoinstall/autoconf %changelog +* Fri May 30 2008 ug@suse.de +- fix for cloning the software section + (bnc#391770) +- 2.16.18 * Tue May 27 2008 ug@suse.de - UI endless loop fixed - 2.16.17 ++++++ autoyast2-2.16.17.tar.bz2 -> autoyast2-2.16.18.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.17/configure new/autoyast2-2.16.18/configure --- old/autoyast2-2.16.17/configure 2008-05-27 15:15:51.000000000 +0200 +++ new/autoyast2-2.16.18/configure 2008-05-30 16:22:39.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for autoyast2 2.16.17. +# Generated by GNU Autoconf 2.61 for autoyast2 2.16.18. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='autoyast2' PACKAGE_TARNAME='autoyast2' -PACKAGE_VERSION='2.16.17' -PACKAGE_STRING='autoyast2 2.16.17' +PACKAGE_VERSION='2.16.18' +PACKAGE_STRING='autoyast2 2.16.18' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1205,7 +1205,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 autoyast2 2.16.17 to adapt to many kinds of systems. +\`configure' configures autoyast2 2.16.18 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1276,7 +1276,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of autoyast2 2.16.17:";; + short | recursive ) echo "Configuration of autoyast2 2.16.18:";; esac cat <<\_ACEOF @@ -1354,7 +1354,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -autoyast2 configure 2.16.17 +autoyast2 configure 2.16.18 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1368,7 +1368,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by autoyast2 $as_me 2.16.17, which was +It was created by autoyast2 $as_me 2.16.18, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2189,7 +2189,7 @@ # Define the identity of the package. PACKAGE='autoyast2' - VERSION='2.16.17' + VERSION='2.16.18' cat >>confdefs.h <<_ACEOF @@ -2416,7 +2416,7 @@ -VERSION="2.16.17" +VERSION="2.16.18" RPMNAME="autoyast2" MAINTAINER="Uwe Gansert <ug@suse.de>" @@ -3429,7 +3429,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by autoyast2 $as_me 2.16.17, which was +This file was extended by autoyast2 $as_me 2.16.18, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3472,7 +3472,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -autoyast2 config.status 2.16.17 +autoyast2 config.status 2.16.18 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/autoyast2-2.16.17/configure.in new/autoyast2-2.16.18/configure.in --- old/autoyast2-2.16.17/configure.in 2008-05-27 15:15:46.000000000 +0200 +++ new/autoyast2-2.16.18/configure.in 2008-05-30 16:22:34.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(autoyast2, 2.16.17, http://bugs.opensuse.org/, autoyast2) +AC_INIT(autoyast2, 2.16.18, http://bugs.opensuse.org/, autoyast2) 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.16.17" +VERSION="2.16.18" RPMNAME="autoyast2" MAINTAINER="Uwe Gansert <ug@suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.17/src/modules/AutoinstClone.ycp new/autoyast2-2.16.18/src/modules/AutoinstClone.ycp --- old/autoyast2-2.16.17/src/modules/AutoinstClone.ycp 2007-05-21 12:26:37.000000000 +0200 +++ new/autoyast2-2.16.18/src/modules/AutoinstClone.ycp 2008-05-30 16:22:30.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Anas Nashif <nashif@suse.de> * - * $Id: AutoinstClone.ycp 37560 2007-04-19 08:52:19Z ug $ + * $Id: AutoinstClone.ycp 47966 2008-05-30 14:22:30Z ug $ * * */ @@ -305,6 +305,39 @@ return drives; } + global define boolean isPatternFulfilled( string p ) { + list<map<string,any> > all_xpatterns = Pkg::ResolvableDependencies ("", `pattern, ""); + list<string> inst = Pkg::GetPackages(`installed, true); + boolean ret = true; + + foreach( map<string,any> dep, all_xpatterns, ``{ + if( ret == true && dep["name"]:"" == p ) { + foreach( map<string,string> dep2, dep["dependencies"]:[], ``{ + if( dep2["dep_kind"]:"" == "requires" ) { + if( dep2["res_kind"]:"" == "package" && !contains( inst, dep2["name"]:"" ) ) { + ret = false; + break; + } else if( dep2["res_kind"]:"" == "pattern" && !isPatternFulfilled( dep2["name"]:"" ) ) { + ret = false; + break; + } + } + }); + } + }); + return ret; + } + + global define list<string> getPatterns() { + list<string> ret = []; + list<map<string,any> > all_patterns = Pkg::ResolvableProperties ("", `pattern, ""); + + foreach( map<string,any> m, all_patterns, ``{ + if( isPatternFulfilled( m["name"]:"" ) ) + ret = add( ret, m["name"]:"" ); + }); + return ret; + } /** * Return list of software packages of calling client @@ -315,18 +348,20 @@ */ global define map<string, any > Software() { - boolean ret = Pkg::TargetInit("/", false); +// boolean ret = Pkg::TargetInit("/", false); + Pkg::TargetInitialize ("/"); + Pkg::TargetLoad(); + Pkg::SourceStartManager (true); list<string> inst = Pkg::GetPackages(`installed, true); list<map<string,any> > all_patterns = Pkg::ResolvableProperties ("", `pattern, ""); list<map<string,any> > all_xpatterns = Pkg::ResolvableDependencies ("", `pattern, ""); list<string> patterns = []; - foreach( map<string,any> m, all_patterns, ``{ - if( m["status"]:`nothing == `installed ) - patterns = add( patterns, m["name"]:"" ); - }); - + // get all fulfilled patterns + // way too many will be fulfilled + // we will clean that up later + patterns = getPatterns(); Pkg::TargetFinish (); @@ -337,14 +372,6 @@ Pkg::SourceStartManager(true); - - /* FIXME: if this would work, it would be the better solution - foreach(string p, patterns, ``{ - Pkg::ResolvableInstall( p, `pattern ); - }); - Pkg::PkgSolve(false); - */ - list<string> packages = Pkg::FilterPackages(false, false, true, true); Pkg::TargetFinish (); // Remove kernel packages @@ -352,14 +379,24 @@ list<string> removepackages = []; list<string> patternPackages = []; + list<string> new_p = []; foreach( string tmp_pattern, patterns, ``{ list<map<string,any> > xpattern = filter( map<string,any> p, all_xpatterns, ``( p["name"]:"" == tmp_pattern ) ); map<string,any> found = xpattern[0]:$[]; + boolean req = false; foreach( map<string,any> d, found["dependencies"]:[], ``{ - if( d["res_kind"]:"" == "package" && d["dep_kind"]:"" == "requires" ) + if( d["res_kind"]:"" == "package" && d["dep_kind"]:"" == "requires" ) { patternPackages = add(patternPackages, d["name"]:""); + req = true; + } }); + // workaround for our pattern design + if( req == true ) + new_p = add( new_p, tmp_pattern ); }); + patterns = new_p; + + map<string, any > software = $[]; if( size(patterns) > 0 ) { foreach(string p, inst, ``{ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.17/VERSION new/autoyast2-2.16.18/VERSION --- old/autoyast2-2.16.17/VERSION 2008-05-27 15:15:18.000000000 +0200 +++ new/autoyast2-2.16.18/VERSION 2008-05-30 16:22:07.000000000 +0200 @@ -1 +1 @@ -2.16.17 +2.16.18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org