[yast-commit] r62346 - in /branches/tmp/jsrain/unattended-migration/autoinstallation: autoyast2.spec.in src/clients/inst_autosetup_upgrade.ycp src/clients/inst_store_upgrade_software.ycp

Author: jsrain Date: Thu Aug 5 11:30:03 2010 New Revision: 62346 URL: http://svn.opensuse.org/viewcvs/yast?rev=62346&view=rev Log: updated software selection dumping updated file list Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/autoyast2.spec.in branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autosetup_upgrade.ycp branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_store_upgrade_software.ycp Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/autoyast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migration/autoinstallation/autoyast2.spec.in?rev=62346&r1=62345&r2=62346&view=diff ============================================================================== --- branches/tmp/jsrain/unattended-migration/autoinstallation/autoyast2.spec.in (original) +++ branches/tmp/jsrain/unattended-migration/autoinstallation/autoyast2.spec.in Thu Aug 5 11:30:03 2010 @@ -189,6 +189,9 @@ @clientdir@/autoinst_scripts1_finish.ycp @clientdir@/autoinst_scripts2_finish.ycp @clientdir@/ayast_probe.ycp +@clientdir@/inst_autosetup_upgrade.ycp +@clientdir@/inst_store_upgrade_software.ycp + @yncludedir@/autoinstall/xml.ycp @yncludedir@/autoinstall/ask.ycp Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autosetup_upgrade.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autosetup_upgrade.ycp?rev=62346&r1=62345&r2=62346&view=diff ============================================================================== --- branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autosetup_upgrade.ycp (original) +++ branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autosetup_upgrade.ycp Thu Aug 5 11:30:03 2010 @@ -409,7 +409,11 @@ if (Pkg::PkgSolve (!Update::onlyUpdateInstalled)) Update::solve_errors = 0; else - Update::solve_errors = Pkg::PkgSolveErrors (); + { + Update::solve_errors = Pkg::PkgSolveErrors (); + if (Profile::current["upgrade","stop_on_solver_conflict"]:true) + AutoinstConfig::Confirm = true; + } } Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_store_upgrade_software.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_store_upgrade_software.ycp?rev=62346&r1=62345&r2=62346&view=diff ============================================================================== --- branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_store_upgrade_software.ycp (original) +++ branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_store_upgrade_software.ycp Thu Aug 5 11:30:03 2010 @@ -10,40 +10,40 @@ // find out status of patterns list > patterns = Pkg::ResolvableProperties ("", `pattern, ""); patterns = filter (map p, patterns, { - return p["status"]:nil == `selected || p["status"]:nil == `removed; - }); - patterns = filter (map p, patterns, { return p["transact_by"]:nil == `user || p["transact_by"]:nil == `app_high; }); list<string> patterns_to_remove = []; list<string> patterns_to_install = maplist (map p, patterns, { - if (p["status"]:nil == `selected) + if (p["status"]:nil == `selected || p["status"]:nil == `installed) return p["name"]:""; - else + else if (p["status"]:nil == `removed || p["status"]:nil == `available) patterns_to_remove = add (patterns_to_remove, p["name"]:""); return nil; }); + patterns_to_install = filter (string p, patterns_to_install, { + return p != nil; + }); y2internal ("Patterns to install: %1", patterns_to_install); y2internal ("Patterns to remove: %1", patterns_to_remove); // find out status of packages list > packages = Pkg::ResolvableProperties ("", `package, ""); packages = filter (map p, packages, { - return p["status"]:nil == `selected || p["status"]:nil == `removed; - }); - packages = filter (map p, packages, { return p["transact_by"]:nil == `user || p["transact_by"]:nil == `app_high; }); list<string> packages_to_remove = []; list<string> packages_to_install = maplist (map p, packages, { - if (p["status"]:nil == `selected) + if (p["status"]:nil == `selected || p["status"]:nil == `installed) return p["name"]:""; - else + else if (p["status"]:nil == `removed || p["status"]:nil == `available) packages_to_remove = add (packages_to_remove, p["name"]:""); return nil; }); + packages_to_install = filter (string p, packages_to_install, { + return p != nil; + }); y2internal ("Packages to install: %1", packages_to_install); y2internal ("Packages to remove: %1", packages_to_remove); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org