Author: ug Date: Mon Feb 9 12:19:36 2009 New Revision: 55337 URL: http://svn.opensuse.org/viewcvs/yast?rev=55337&view=rev Log: shell escape added for the password for encrypted profiles. speed up software cloning with many repositories. clean up Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/AutoinstSoftware.ycp trunk/autoinstallation/src/modules/Profile.ycp trunk/autoinstallation/src/modules/ProfileLocation.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=55337&r1=55336&r2=55337&view=diff ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Mon Feb 9 12:19:36 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Feb 9 11:19:44 CET 2009 - ug@suse.de + +- shell escape added for the password for encrypted profiles +- speed up software cloning with many repositories +- clean up + +------------------------------------------------------------------- Fri Feb 6 15:56:28 CET 2009 - ug@suse.de - Wrapper for LibStorage::humanStringToByte added Modified: trunk/autoinstallation/src/modules/AutoinstSoftware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstSoftware.ycp?rev=55337&r1=55336&r2=55337&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstSoftware.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstSoftware.ycp Mon Feb 9 12:19:36 2009 @@ -263,71 +263,6 @@ } } - if (haskey(Profile::current, "inetd")) { - map conf = Profile::current["inetd"]:$[]; - if (conf["netd_service"]:`none == `xinetd ) - allpackages = (list<string>) union(allpackages, - ["xinetd"]); - else - allpackages = (list<string>) union(allpackages, - ["inetd"]); - - } - - if (haskey(Profile::current, "nis")) { - map conf = Profile::current["nis"]:$[]; - if (conf["start_nis"]:false) - allpackages = (list<string>) union(allpackages, ["yast2-nis-client","ypbind"]); - - if (conf["start_autofs"]:false) - { - string pkg = "autofs4"; - allpackages = add (allpackages, pkg); - } - } - - if (haskey(Profile::current, "security")) { - allpackages = (list<string>) union(allpackages, - ["yast2-security"]); - } - - if (haskey(Profile::current, "ldap")) { - map ldapclient = Profile::current["ldap"]:$[]; - if (ldapclient["start_ldap"]:false) - allpackages = (list<string>) union(allpackages, ["pam_ldap","nss_ldap"]); - if (ldapclient["start_autofs"]:false) - { - string pkg = "autofs4"; - allpackages = add (allpackages, pkg); - } - } - - if (haskey(Profile::current, "nfs_server")) - { - boolean start_nfsserver = Profile::current["nfs_server", "start_nfsserver"]:false; - if (start_nfsserver) - allpackages = (list<string>) union(allpackages, ["yast2-nfs-server", "nfs-kernel-server"]); - } - - - if (haskey(Profile::current, "mail")) { - map mail = Profile::current["mail"]:$[]; - if (mail["mta"]:`other == `postfix) - { - allpackages = add(allpackages, "postfix"); - PackageAI::toremove = add(PackageAI::toremove, "sendmail"); - if (mail["use_amavis"]:false) - allpackages = add(allpackages, "amavis-postfix"); - } - else if (mail["mta"]:`other == `sendmail) - { - allpackages = add(allpackages, "sendmail"); - PackageAI::toremove = add(PackageAI::toremove, "postfix"); - - if (mail["use_amavis"]:false) - allpackages = add(allpackages, "amavis-sendmail"); - } - } return allpackages; } @@ -532,9 +467,14 @@ emergency_break = emergency_break + 1; /* remove all packages that are pulled in by the resolver anyway */ list<string> tmp = []; + patternPackagesTemp = toset( patternPackagesTemp ); + y2milestone("patternPackagesTemp = %1", patternPackagesTemp); foreach( string ppackage, patternPackagesTemp, ``{ + y2milestone("UWE1"); foreach( map d, Pkg::ResolvableDependencies (ppackage, `package, ""), ``{ + y2milestone("UWE2"); foreach( map dd, d["dependencies"]:[], ``{ + y2milestone("UWE3"); if( dd["res_kind"]:"" == "package" && (dd["dep_kind"]:"" == "requires" || dd["dep_kind"]:"" == "recommends") && !contains(patternPackages , dd["name"]:"") ) { patternPackages = add(patternPackages, dd["name"]:""); tmp = add(tmp, dd["name"]:""); @@ -561,7 +501,7 @@ software["packages"] = sort( filter(string pkg, userpackages, ``(! regexpmatch(pkg, "kernel-.*") || pkg == "kernel-uml")) ); software["patterns"] = sort( visible_patterns ); - software["remove-packages"] = sort( removepackages ); + software["remove-packages"] = toset( removepackages ); return software; } Modified: trunk/autoinstallation/src/modules/Profile.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Profile.ycp?rev=55337&r1=55336&r2=55337&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/Profile.ycp (original) +++ trunk/autoinstallation/src/modules/Profile.ycp Mon Feb 9 12:19:36 2009 @@ -359,7 +359,7 @@ } until ( button == `ok ); UI::CloseDialog(); } while( p != q ); - AutoinstConfig::ProfilePassword = p; + AutoinstConfig::ProfilePassword = AutoinstConfig::ShellEscape((string)p); } string dir = (string)SCR::Read(.target.tmpdir); string command = sformat("gpg2 -c --armor --batch --passphrase \"%1\" --output %2/encrypted_autoyast.xml", Modified: trunk/autoinstallation/src/modules/ProfileLocation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/ProfileLocation.ycp?rev=55337&r1=55336&r2=55337&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/ProfileLocation.ycp (original) +++ trunk/autoinstallation/src/modules/ProfileLocation.ycp Mon Feb 9 12:19:36 2009 @@ -69,9 +69,9 @@ AutoinstConfig::filepath = (string)SCR::Read(.etc.install_inf.Serverdir)+"/"+AutoinstConfig::host; } if( (string)SCR::Read(.etc.install_inf.Server) != nil ) { - AutoinstConfig::host = (string)SCR::Read(.etc.install_inf.Server); + AutoinstConfig::host = (string)SCR::Read(.etc.install_inf.Server); + } } - } y2milestone("relurl for profile changed to: %1://%2%3",AutoinstConfig::scheme, AutoinstConfig::host, AutoinstConfig::filepath); SCR::Write ( .etc.install_inf.ayrelurl, sformat("%1://%2/%3",AutoinstConfig::scheme, AutoinstConfig::host, AutoinstConfig::filepath) ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org