January 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60601 - /tags/branch-Code-11-SP1-2_17_19/update/
by locilka＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: locilka Date: Thu Jan 28 12:05:47 2010 New Revision: 60601 URL: http://svn.opensuse.org/viewcvs/yast?rev=60601&view=rev Log: Created tag branch-Code-11-SP1-2_17_19 for update Added: tags/branch-Code-11-SP1-2_17_19/update/ (props changed) - copied from r60600, branches/SuSE-Code-11-SP1-Branch/update/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60600 - /tags/branch-Code-11-2_17_18_1/update/
by locilka＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: locilka Date: Thu Jan 28 12:01:07 2010 New Revision: 60600 URL: http://svn.opensuse.org/viewcvs/yast?rev=60600&view=rev Log: Created tag branch-Code-11-2_17_18_1 for update Added: tags/branch-Code-11-2_17_18_1/update/ - copied from r60599, branches/SuSE-Code-11-Branch/update/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60599 - /tags/branch-Code-11-2_17_18_1/
by locilka＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: locilka Date: Thu Jan 28 12:01:05 2010 New Revision: 60599 URL: http://svn.opensuse.org/viewcvs/yast?rev=60599&view=rev Log: Created tag branch-Code-11-2_17_18_1 Added: tags/branch-Code-11-2_17_18_1/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60598 - /trunk/wagon/src/config/online_migration.xml
by locilka＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: locilka Date: Thu Jan 28 11:53:03 2010 New Revision: 60598 URL: http://svn.opensuse.org/viewcvs/yast?rev=60598&view=rev Log: Added yast-update to packages selected for (self) upgrade Modified: trunk/wagon/src/config/online_migration.xml Modified: trunk/wagon/src/config/online_migration.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/config/online_migratio… ============================================================================== --- trunk/wagon/src/config/online_migration.xml (original) +++ trunk/wagon/src/config/online_migration.xml Thu Jan 28 11:53:03 2010 @@ -162,6 +162,7 @@ <package>yast2-wagon</package> <package>yast2-online-update</package> <package>yast2-pkg-bindings</package> + <package>yast2-update</package> <package>libzypp</package> </packages_affecting_pkg_manager> </software> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60597 - in /branches/SuSE-Code-11-Branch/wagon: package/yast2-wagon.changes src/config/online_migration.xml yast2-wagon.spec.in
by locilka＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: locilka Date: Thu Jan 28 11:52:23 2010 New Revision: 60597 URL: http://svn.opensuse.org/viewcvs/yast?rev=60597&view=rev Log: Updated RPM dependencies (BNC #573482) Modified: branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml branches/SuSE-Code-11-Branch/wagon/yast2-wagon.spec.in Modified: branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/pac… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes Thu Jan 28 11:52:23 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jan 28 11:45:12 CET 2010 - locilka(a)suse.cz + +- Updated RPM dependencies (BNC #573482). + +------------------------------------------------------------------- Wed Jan 27 11:52:01 CET 2010 - locilka(a)suse.cz - Disabling repositories that provide some old version of product Modified: branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml (original) +++ branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml Thu Jan 28 11:52:23 2010 @@ -162,6 +162,7 @@ <package>yast2-wagon</package> <package>yast2-online-update</package> <package>yast2-pkg-bindings</package> + <package>yast2-update</package> <package>libzypp</package> </packages_affecting_pkg_manager> </software> Modified: branches/SuSE-Code-11-Branch/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/yas… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/yast2-wagon.spec.in (original) +++ branches/SuSE-Code-11-Branch/wagon/yast2-wagon.spec.in Thu Jan 28 11:52:23 2010 @@ -8,7 +8,10 @@ Requires: yast2-pkg-bindings >= 2.17.39.2 # Called in proposal and in code -Requires: yast2-packager yast2-update yast2-add-on +Requires: yast2-packager yast2-add-on + +# Counting packages directly in packages proposal (BNC #573482) +Requires: yast2-update >= 2.17.18.1 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-update -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60596 - in /branches/SuSE-Code-11-SP1-Branch/wagon: package/yast2-wagon.changes src/config/online_migration.xml yast2-wagon.spec.in
by locilka＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: locilka Date: Thu Jan 28 11:51:49 2010 New Revision: 60596 URL: http://svn.opensuse.org/viewcvs/yast?rev=60596&view=rev Log: Updated RPM dependencies (BNC #573482) Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Thu Jan 28 11:51:49 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jan 28 11:45:12 CET 2010 - locilka(a)suse.cz + +- Updated RPM dependencies (BNC #573482). + +------------------------------------------------------------------- Wed Jan 27 11:52:01 CET 2010 - locilka(a)suse.cz - Disabling repositories that provide some old version of product Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml Thu Jan 28 11:51:49 2010 @@ -162,6 +162,7 @@ <package>yast2-wagon</package> <package>yast2-online-update</package> <package>yast2-pkg-bindings</package> + <package>yast2-update</package> <package>libzypp</package> </packages_affecting_pkg_manager> </software> Modified: branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in Thu Jan 28 11:51:49 2010 @@ -8,7 +8,10 @@ Requires: yast2-pkg-bindings >= 2.17.44 # Called in proposal and in code -Requires: yast2-packager yast2-update yast2-add-on +Requires: yast2-packager yast2-add-on + +# Counting packages directly in packages proposal (BNC #573482) +Requires: yast2-update >= 2.17.19 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-update -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60595 - in /branches/SuSE-Code-11-Branch/update: VERSION package/yast2-update.changes src/clients/packages_proposal.ycp src/clients/update_proposal.ycp
by locilka＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: locilka Date: Thu Jan 28 11:13:46 2010 New Revision: 60595 URL: http://svn.opensuse.org/viewcvs/yast?rev=60595&view=rev Log: - Counting packages directly in packages proposal (BNC #573482). - 2.17.18.1 Modified: branches/SuSE-Code-11-Branch/update/VERSION branches/SuSE-Code-11-Branch/update/package/yast2-update.changes branches/SuSE-Code-11-Branch/update/src/clients/packages_proposal.ycp branches/SuSE-Code-11-Branch/update/src/clients/update_proposal.ycp Modified: branches/SuSE-Code-11-Branch/update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/update/VE… ============================================================================== --- branches/SuSE-Code-11-Branch/update/VERSION (original) +++ branches/SuSE-Code-11-Branch/update/VERSION Thu Jan 28 11:13:46 2010 @@ -1 +1 @@ -2.17.18 +2.17.18.1 Modified: branches/SuSE-Code-11-Branch/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/update/pa… ============================================================================== --- branches/SuSE-Code-11-Branch/update/package/yast2-update.changes (original) +++ branches/SuSE-Code-11-Branch/update/package/yast2-update.changes Thu Jan 28 11:13:46 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 28 11:07:00 CET 2010 - locilka(a)suse.cz + +- Counting packages directly in packages proposal (BNC #573482). +- 2.17.18.1 + +------------------------------------------------------------------- Mon Jan 19 16:17:31 CET 2009 - locilka(a)suse.cz - Added possibility to manually choose a /var partition if YaST Modified: branches/SuSE-Code-11-Branch/update/src/clients/packages_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/update/sr… ============================================================================== --- branches/SuSE-Code-11-Branch/update/src/clients/packages_proposal.ycp (original) +++ branches/SuSE-Code-11-Branch/update/src/clients/packages_proposal.ycp Thu Jan 28 11:13:46 2010 @@ -59,6 +59,46 @@ // SpaceCalculation::ShowPartitionWarning (); list<string> warning = SpaceCalculation::GetPartitionWarning (); + // Count statistics --> + // Pkg::GetPackages() + // `installed all installed packages + // `selected returns all selected but not yet installed packages + // `available returns all available packages (from the installation source) + // `removed all packages selected for removal + + // recreate the update summary + list<string> installed = Pkg::GetPackages (`installed, true); + list<string> selected = Pkg::GetPackages (`selected, true); + list<string> removed = Pkg::GetPackages (`removed, true); + integer cnt_installed = size (installed); + integer cnt_selected = size (selected); + integer cnt_removed = size (removed); + y2milestone ("Selected: %1, Installed: %2, Removed: %3", cnt_selected, cnt_installed, cnt_removed); + y2milestone("Removed: %1", removed); + + map<string,boolean> installed_m = listmap (string p, installed, { + return $[ p : true ]; + }); + map<string,boolean> selected_m = listmap (string p, selected, { + return $[ p : true ]; + }); + + // packages that are both 'installed' && 'selected' + Update::packages_to_update = size (filter (string p, selected, { + return haskey (installed_m, p); + })); + // packages that are 'selected' but not 'installed' + Update::packages_to_install = cnt_selected - Update::packages_to_update; + + // packages that are 'removed' but not 'selected again' + Update::packages_to_remove = size (filter (string p, removed, { + return ! haskey (selected_m, p); + })); + + y2milestone("Update statistics: Updated: %1, Installed: %2, Removed: %3", + Update::packages_to_update, Update::packages_to_install, Update::packages_to_remove); + // <-- Count statistics + list<string> tmp = []; // proposal for packages during update, %1 is count of packages Modified: branches/SuSE-Code-11-Branch/update/src/clients/update_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/update/sr… ============================================================================== --- branches/SuSE-Code-11-Branch/update/src/clients/update_proposal.ycp (original) +++ branches/SuSE-Code-11-Branch/update/src/clients/update_proposal.ycp Thu Jan 28 11:13:46 2010 @@ -304,43 +304,6 @@ Update::products_incompatible = true; } } - // Pkg::GetPackages() - // `installed all installed packages - // `selected returns all selected but not yet installed packages - // `available returns all available packages (from the installation source) - // `removed all packages selected for removal - - // recreate the update summary - list<string> installed = Pkg::GetPackages (`installed, true); - list<string> selected = Pkg::GetPackages (`selected, true); - list<string> removed = Pkg::GetPackages (`removed, true); - integer cnt_installed = size (installed); - integer cnt_selected = size (selected); - integer cnt_removed = size (removed); - y2milestone ("Selected: %1, Installed: %2, Removed: %3", cnt_selected, cnt_installed, cnt_removed); - y2milestone("Removed: %1", removed); - - map<string,boolean> installed_m = listmap (string p, installed, { - return $[ p : true ]; - }); - map<string,boolean> selected_m = listmap (string p, selected, { - return $[ p : true ]; - }); - - // packages that are both 'installed' && 'selected' - Update::packages_to_update = size (filter (string p, selected, { - return haskey (installed_m, p); - })); - // packages that are 'selected' but not 'installed' - Update::packages_to_install = cnt_selected - Update::packages_to_update; - - // packages that are 'removed' but not 'selected again' - Update::packages_to_remove = size (filter (string p, removed, { - return ! haskey (selected_m, p); - })); - - y2milestone("Update statistics: Updated: %1, Installed: %2, Removed: %3", - Update::packages_to_update, Update::packages_to_install, Update::packages_to_remove); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60594 - in /branches/SuSE-Code-11-SP1-Branch/update: VERSION package/yast2-update.changes src/clients/packages_proposal.ycp src/clients/update_proposal.ycp
by locilka＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: locilka Date: Thu Jan 28 11:13:19 2010 New Revision: 60594 URL: http://svn.opensuse.org/viewcvs/yast?rev=60594&view=rev Log: - Counting packages directly in packages proposal (BNC #573482). - 2.17.19 Modified: branches/SuSE-Code-11-SP1-Branch/update/VERSION branches/SuSE-Code-11-SP1-Branch/update/package/yast2-update.changes branches/SuSE-Code-11-SP1-Branch/update/src/clients/packages_proposal.ycp branches/SuSE-Code-11-SP1-Branch/update/src/clients/update_proposal.ycp Modified: branches/SuSE-Code-11-SP1-Branch/update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/updat… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/update/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/update/VERSION Thu Jan 28 11:13:19 2010 @@ -1 +1 @@ -2.17.18 +2.17.19 Modified: branches/SuSE-Code-11-SP1-Branch/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/updat… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/update/package/yast2-update.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/update/package/yast2-update.changes Thu Jan 28 11:13:19 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 28 11:07:00 CET 2010 - locilka(a)suse.cz + +- Counting packages directly in packages proposal (BNC #573482). +- 2.17.19 + +------------------------------------------------------------------- Tue May 12 13:06:56 CEST 2009 - locilka(a)suse.cz - Removed copying inst-sys users to installed system during Modified: branches/SuSE-Code-11-SP1-Branch/update/src/clients/packages_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/updat… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/update/src/clients/packages_proposal.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/update/src/clients/packages_proposal.ycp Thu Jan 28 11:13:19 2010 @@ -59,6 +59,46 @@ // SpaceCalculation::ShowPartitionWarning (); list<string> warning = SpaceCalculation::GetPartitionWarning (); + // Count statistics --> + // Pkg::GetPackages() + // `installed all installed packages + // `selected returns all selected but not yet installed packages + // `available returns all available packages (from the installation source) + // `removed all packages selected for removal + + // recreate the update summary + list<string> installed = Pkg::GetPackages (`installed, true); + list<string> selected = Pkg::GetPackages (`selected, true); + list<string> removed = Pkg::GetPackages (`removed, true); + integer cnt_installed = size (installed); + integer cnt_selected = size (selected); + integer cnt_removed = size (removed); + y2milestone ("Selected: %1, Installed: %2, Removed: %3", cnt_selected, cnt_installed, cnt_removed); + y2milestone("Removed: %1", removed); + + map<string,boolean> installed_m = listmap (string p, installed, { + return $[ p : true ]; + }); + map<string,boolean> selected_m = listmap (string p, selected, { + return $[ p : true ]; + }); + + // packages that are both 'installed' && 'selected' + Update::packages_to_update = size (filter (string p, selected, { + return haskey (installed_m, p); + })); + // packages that are 'selected' but not 'installed' + Update::packages_to_install = cnt_selected - Update::packages_to_update; + + // packages that are 'removed' but not 'selected again' + Update::packages_to_remove = size (filter (string p, removed, { + return ! haskey (selected_m, p); + })); + + y2milestone("Update statistics: Updated: %1, Installed: %2, Removed: %3", + Update::packages_to_update, Update::packages_to_install, Update::packages_to_remove); + // <-- Count statistics + list<string> tmp = []; // proposal for packages during update, %1 is count of packages Modified: branches/SuSE-Code-11-SP1-Branch/update/src/clients/update_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/updat… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/update/src/clients/update_proposal.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/update/src/clients/update_proposal.ycp Thu Jan 28 11:13:19 2010 @@ -304,43 +304,6 @@ Update::products_incompatible = true; } } - // Pkg::GetPackages() - // `installed all installed packages - // `selected returns all selected but not yet installed packages - // `available returns all available packages (from the installation source) - // `removed all packages selected for removal - - // recreate the update summary - list<string> installed = Pkg::GetPackages (`installed, true); - list<string> selected = Pkg::GetPackages (`selected, true); - list<string> removed = Pkg::GetPackages (`removed, true); - integer cnt_installed = size (installed); - integer cnt_selected = size (selected); - integer cnt_removed = size (removed); - y2milestone ("Selected: %1, Installed: %2, Removed: %3", cnt_selected, cnt_installed, cnt_removed); - y2milestone("Removed: %1", removed); - - map<string,boolean> installed_m = listmap (string p, installed, { - return $[ p : true ]; - }); - map<string,boolean> selected_m = listmap (string p, selected, { - return $[ p : true ]; - }); - - // packages that are both 'installed' && 'selected' - Update::packages_to_update = size (filter (string p, selected, { - return haskey (installed_m, p); - })); - // packages that are 'selected' but not 'installed' - Update::packages_to_install = cnt_selected - Update::packages_to_update; - - // packages that are 'removed' but not 'selected again' - Update::packages_to_remove = size (filter (string p, removed, { - return ! haskey (selected_m, p); - })); - - y2milestone("Update statistics: Updated: %1, Installed: %2, Removed: %3", - Update::packages_to_update, Update::packages_to_install, Update::packages_to_remove); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60593 - in /trunk/update: package/yast2-update.changes src/clients/packages_proposal.ycp src/clients/update_proposal.ycp
by locilka＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: locilka Date: Thu Jan 28 11:12:45 2010 New Revision: 60593 URL: http://svn.opensuse.org/viewcvs/yast?rev=60593&view=rev Log: - Counting packages directly in packages proposal (BNC #573482). Modified: trunk/update/package/yast2-update.changes trunk/update/src/clients/packages_proposal.ycp trunk/update/src/clients/update_proposal.ycp Modified: trunk/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.chan… ============================================================================== --- trunk/update/package/yast2-update.changes (original) +++ trunk/update/package/yast2-update.changes Thu Jan 28 11:12:45 2010 @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 28 11:07:00 CET 2010 - locilka(a)suse.cz + +- Counting packages directly in packages proposal (BNC #573482). + ------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz Modified: trunk/update/src/clients/packages_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/packages_prop… ============================================================================== --- trunk/update/src/clients/packages_proposal.ycp (original) +++ trunk/update/src/clients/packages_proposal.ycp Thu Jan 28 11:12:45 2010 @@ -59,6 +59,46 @@ // SpaceCalculation::ShowPartitionWarning (); list<string> warning = SpaceCalculation::GetPartitionWarning (); + // Count statistics --> + // Pkg::GetPackages() + // `installed all installed packages + // `selected returns all selected but not yet installed packages + // `available returns all available packages (from the installation source) + // `removed all packages selected for removal + + // recreate the update summary + list<string> installed = Pkg::GetPackages (`installed, true); + list<string> selected = Pkg::GetPackages (`selected, true); + list<string> removed = Pkg::GetPackages (`removed, true); + integer cnt_installed = size (installed); + integer cnt_selected = size (selected); + integer cnt_removed = size (removed); + y2milestone ("Selected: %1, Installed: %2, Removed: %3", cnt_selected, cnt_installed, cnt_removed); + y2milestone("Removed: %1", removed); + + map<string,boolean> installed_m = listmap (string p, installed, { + return $[ p : true ]; + }); + map<string,boolean> selected_m = listmap (string p, selected, { + return $[ p : true ]; + }); + + // packages that are both 'installed' && 'selected' + Update::packages_to_update = size (filter (string p, selected, { + return haskey (installed_m, p); + })); + // packages that are 'selected' but not 'installed' + Update::packages_to_install = cnt_selected - Update::packages_to_update; + + // packages that are 'removed' but not 'selected again' + Update::packages_to_remove = size (filter (string p, removed, { + return ! haskey (selected_m, p); + })); + + y2milestone("Update statistics: Updated: %1, Installed: %2, Removed: %3", + Update::packages_to_update, Update::packages_to_install, Update::packages_to_remove); + // <-- Count statistics + list<string> tmp = []; // proposal for packages during update, %1 is count of packages Modified: trunk/update/src/clients/update_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/update_propos… ============================================================================== --- trunk/update/src/clients/update_proposal.ycp (original) +++ trunk/update/src/clients/update_proposal.ycp Thu Jan 28 11:12:45 2010 @@ -304,43 +304,6 @@ Update::products_incompatible = true; } } - // Pkg::GetPackages() - // `installed all installed packages - // `selected returns all selected but not yet installed packages - // `available returns all available packages (from the installation source) - // `removed all packages selected for removal - - // recreate the update summary - list<string> installed = Pkg::GetPackages (`installed, true); - list<string> selected = Pkg::GetPackages (`selected, true); - list<string> removed = Pkg::GetPackages (`removed, true); - integer cnt_installed = size (installed); - integer cnt_selected = size (selected); - integer cnt_removed = size (removed); - y2milestone ("Selected: %1, Installed: %2, Removed: %3", cnt_selected, cnt_installed, cnt_removed); - y2milestone("Removed: %1", removed); - - map<string,boolean> installed_m = listmap (string p, installed, { - return $[ p : true ]; - }); - map<string,boolean> selected_m = listmap (string p, selected, { - return $[ p : true ]; - }); - - // packages that are both 'installed' && 'selected' - Update::packages_to_update = size (filter (string p, selected, { - return haskey (installed_m, p); - })); - // packages that are 'selected' but not 'installed' - Update::packages_to_install = cnt_selected - Update::packages_to_update; - - // packages that are 'removed' but not 'selected again' - Update::packages_to_remove = size (filter (string p, removed, { - return ! haskey (selected_m, p); - })); - - y2milestone("Update statistics: Updated: %1, Installed: %2, Removed: %3", - Update::packages_to_update, Update::packages_to_install, Update::packages_to_remove); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60592 - /branches/SuSE-Code-11-SP1-Branch/autofs/package/yast2-autofs.changes
by varkoly＠svn.opensuse.org 28 Jan '10

28 Jan '10

Author: varkoly Date: Thu Jan 28 11:00:05 2010 New Revision: 60592 URL: http://svn.opensuse.org/viewcvs/yast?rev=60592&view=rev Log: Fix the changes Modified: branches/SuSE-Code-11-SP1-Branch/autofs/package/yast2-autofs.changes Modified: branches/SuSE-Code-11-SP1-Branch/autofs/package/yast2-autofs.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autof… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autofs/package/yast2-autofs.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/autofs/package/yast2-autofs.changes Thu Jan 28 11:00:05 2010 @@ -2,6 +2,10 @@ Thu Jan 28 10:39:39 CET 2010 - varkoly(a)novell.com - bnc#572823 - Error message in autofs configuration is incorrect + +------------------------------------------------------------------- +Thu Jan 8 13:38:14 CET 2009 - varkoly(a)suse.de + - bnc#464358 - error on console: Use of uninitialized value ------------------------------------------------------------------- -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0