Author: ug Date: Wed Sep 10 10:39:23 2008 New Revision: 50924 URL: http://svn.opensuse.org/viewcvs/yast?rev=50924&view=rev Log: workaround for broken zypp API removed (bnc#407973) Modified: trunk/autoinstallation/doc/CreateProfileDetails.xml trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/AutoinstSoftware.ycp Modified: trunk/autoinstallation/doc/CreateProfileDetails.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/CreateProfileDetails.xml?rev=50924&r1=50923&r2=50924&view=diff ============================================================================== --- trunk/autoinstallation/doc/CreateProfileDetails.xml (original) +++ trunk/autoinstallation/doc/CreateProfileDetails.xml Wed Sep 10 10:39:23 2008 @@ -70,7 +70,7 @@ <emphasis>confirm</emphasis> option to true. </para> <para> - This is the list of proposals for openSUSE 11.1 are: + This is the list of proposals for openSUSE 11.1 are (you can find that in the control.xml on the installation source too): <itemizedlist> <listitem> <para> Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=50924&r1=50923&r2=50924&view=diff ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Wed Sep 10 10:39:23 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Sep 10 10:34:57 CEST 2008 - ug@suse.de + +- workaround for broken resolver removed since it is fixed now and + performance boost by using zypp API now again (bnc#407973) + +------------------------------------------------------------------- Mon Sep 8 13:14:40 CEST 2008 - ug@suse.de - fix for relurl scripts in second stage Modified: trunk/autoinstallation/src/modules/AutoinstSoftware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstSoftware.ycp?rev=50924&r1=50923&r2=50924&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstSoftware.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstSoftware.ycp Wed Sep 10 10:39:23 2008 @@ -51,7 +51,7 @@ global boolean modified = false; global list<string> inst = []; - global map fulfilled_cache = $[]; + global list > all_xpatterns = []; /** * Function sets internal variable, which indicates, that any @@ -451,43 +451,6 @@ AutoinstData::post_packages = (list<string>)toset(union(calcpost,AutoinstData::post_packages)); return; } - - global define boolean isPatternFulfilled( string p ) { - boolean ret = true; - if( haskey( fulfilled_cache, p ) ) - return fulfilled_cache[p]:false; - list > all_xpatterns = Pkg::ResolvableDependencies ("", `pattern, ""); - - foreach( map dep, all_xpatterns, ``{ - if( ret == true && dep["name"]:"" == p ) { - foreach( map 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; - } - } - }); - } - }); - fulfilled_cache[p] = ret; - return ret; - } - - global define list<string> getPatterns() { - list<string> ret = []; - list > all_patterns = Pkg::ResolvableProperties ("", `pattern, ""); - - foreach( map m, all_patterns, ``{ - if( !contains(ret, m["name"]:"") && isPatternFulfilled( m["name"]:"" ) ) - ret = add( ret, m["name"]:"" ); - }); - return ret; - } - /** * Return list of software packages of calling client @@ -498,21 +461,30 @@ */ global define map ReadHelper() { -// boolean ret = Pkg::TargetInit("/", false); - Pkg::TargetInitialize ("/"); + boolean ret = Pkg::TargetInit("/", false); +// Pkg::TargetInitialize ("/"); Pkg::TargetLoad(); Pkg::SourceStartManager (true); + Pkg::PkgSolve(false); inst = Pkg::GetPackages(`installed, true); list > all_patterns = Pkg::ResolvableProperties ("", `pattern, ""); - list > all_xpatterns = Pkg::ResolvableDependencies ("", `pattern, ""); + all_xpatterns = Pkg::ResolvableDependencies ("", `pattern, ""); list<string> patterns = []; + list<string> visible_patterns = []; - // get all fulfilled patterns - // way too many will be fulfilled - // we will clean that up later - patterns = getPatterns(); - + list<map> patternsFullData = filter( map p, Pkg::ResolvableProperties("", `pattern, ""), ``{ + boolean ret = false; + if( p["status"]:`none == `installed && p["user_visible"]:true == true ) { + patterns = add( patterns, p["name"]:"no name" ); + visible_patterns = add( visible_patterns, p["name"]:"no name" ); + ret = true; + } else if( p["status"]:`none == `installed && p["user_visible"]:true == false ) { + patterns = add( patterns, p["name"]:"no name" ); + ret = true; + } + return ret; + }); Pkg::TargetFinish (); string tmproot = AutoinstConfig::tmpDir; @@ -534,6 +506,7 @@ list > xpattern = filter( map p, all_xpatterns, ``( p["name"]:"" == tmp_pattern ) ); map found = xpattern[0]:$[]; boolean req = false; + // kick out hollow patterns (always fullfilled patterns) foreach( map d, found["dependencies"]:[], ``{ if( d["res_kind"]:"" == "package" && d["dep_kind"]:"" == "requires" ) { patternPackages = add(patternPackages, d["name"]:""); @@ -541,6 +514,8 @@ } }); // workaround for our pattern design + // a pattern with no requires at all is always fullfilled of course + // you can fullfill the games pattern with no games installed at all if( req == true ) new_p = add( new_p, tmp_pattern ); }); @@ -560,7 +535,7 @@ } software["packages"] = sort( filter(string pkg, userpackages, ``(! regexpmatch(pkg, "kernel-.*") || pkg == "kernel-uml")) ); - software["patterns"] = sort( patterns ); + software["patterns"] = sort( visible_patterns ); software["remove-packages"] = sort( removepackages ); return software; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org