Author: ug Date: Tue Jun 9 16:24:01 2009 New Revision: 57517 URL: http://svn.opensuse.org/viewcvs/yast?rev=57517&view=rev Log: regex support for packages and patterns added (undocumented feature yet) Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/AutoinstSoftware.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=57517&r1=57516&r2=57517&view=diff ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Tue Jun 9 16:24:01 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jun 9 16:23:23 CEST 2009 - ug@suse.de + +- regex support for packages and patterns added + (undocumented feature yet) + +------------------------------------------------------------------- Thu Jun 4 14:48:31 CEST 2009 - ug@suse.de - creating directories with <files> section possible Modified: trunk/autoinstallation/src/modules/AutoinstSoftware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstSoftware.ycp?rev=57517&r1=57516&r2=57517&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstSoftware.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstSoftware.ycp Tue Jun 9 16:24:01 2009 @@ -85,6 +85,47 @@ string notFound = ""; Packages::Init(true); Packages::InitializeAddOnProducts(); + list<string> packagesAvailable = Pkg::GetPackages (`available, true); + list<string> patternsAvailable = []; + list > allPatterns = Pkg::ResolvableDependencies ("", `pattern, ""); + allPatterns = filter( map m, allPatterns, ``{ + if( m["user_visible"]:false ) + patternsAvailable = add( patternsAvailable, m["name"]:"" ); + return m["user_visible"]:false; + }); + + list<string> regexFound = []; + settings["packages"] = (list<string>)filter( string want_pack, (list<string>)settings["packages"]:[], ``{ + if( !issubstring( want_pack, "/" ) ) + return true; + want_pack = deletechars( want_pack, "/" ); + foreach( string pack, packagesAvailable, ``{ + y2milestone("matching %1 against %2", pack, want_pack); + if( regexpmatch (pack, want_pack) ) { + regexFound = add(regexFound, pack); + y2milestone("match"); + } + }); + return false; + }); + settings["packages"] = (list<string>)union( settings["packages"]:[], regexFound ); + + regexFound = []; + patterns = (list<string>)filter( string want_patt, patterns, ``{ + if( !issubstring( want_patt, "/" ) ) + return true; + want_patt = deletechars( want_patt, "/" ); + foreach( string patt, patternsAvailable, ``{ + y2milestone("matching %1 against %2", patt, want_patt); + if( regexpmatch (patt, want_patt) ) { + regexFound = add(regexFound, patt); + y2milestone("match"); + } + }); + return false; + }); + patterns = (list<string>)union( patterns, regexFound ); + foreach( string pack, settings["packages"]:[], ``{ if( ! Pkg::IsAvailable(pack) && Stage::initial() ) { notFound = notFound + pack + "\n"; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org