[Aptitude-svn-commit] r4014 - in branches/aptitude-0.3/aptitude: .
src
Daniel Burrows
dburrows at costa.debian.org
Wed Aug 31 17:44:13 UTC 2005
Author: dburrows
Date: Wed Aug 31 17:44:10 2005
New Revision: 4014
Modified:
branches/aptitude-0.3/aptitude/ChangeLog
branches/aptitude-0.3/aptitude/src/solution_fragment.cc
Log:
Sort elements of a solution by name.
Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog (original)
+++ branches/aptitude-0.3/aptitude/ChangeLog Wed Aug 31 17:44:10 2005
@@ -1,5 +1,9 @@
2005-08-31 Daniel Burrows <dburrows at debian.org>
+ * src/solution_fragment.cc:
+
+ Sort elements of a solution by name.
+
* src/cmdline/cmdline_resolver.cc, src/cmdline/cmdline_util.cc, src/cmdline/cmdline_util.h, src/ui.cc, src/ui.h:
Let the user enter the visual interface from the resolver
Modified: branches/aptitude-0.3/aptitude/src/solution_fragment.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/solution_fragment.cc (original)
+++ branches/aptitude-0.3/aptitude/src/solution_fragment.cc Wed Aug 31 17:44:10 2005
@@ -164,17 +164,6 @@
vector<pkgCache::VerIterator> downgrade_packages;
vector<pkgCache::VerIterator> upgrade_packages;
- sort(remove_packages.begin(), remove_packages.end(),
- pkg_name_lt());
- sort(keep_packages.begin(), keep_packages.end(),
- pkg_name_lt());
- sort(install_packages.begin(), install_packages.end(),
- ver_name_lt());
- sort(downgrade_packages.begin(), downgrade_packages.end(),
- ver_name_lt());
- sort(upgrade_packages.begin(), upgrade_packages.end(),
- ver_name_lt());
-
for(imm::map<aptitude_universe::package,
aptitude_solution::action>::const_iterator i=sol.get_actions().begin();
i!=sol.get_actions().end(); ++i)
@@ -214,6 +203,17 @@
}
}
+ sort(remove_packages.begin(), remove_packages.end(),
+ pkg_name_lt());
+ sort(keep_packages.begin(), keep_packages.end(),
+ pkg_name_lt());
+ sort(install_packages.begin(), install_packages.end(),
+ ver_name_lt());
+ sort(downgrade_packages.begin(), downgrade_packages.end(),
+ ver_name_lt());
+ sort(upgrade_packages.begin(), upgrade_packages.end(),
+ ver_name_lt());
+
vector<fragment *> fragments;
if(!remove_packages.empty())
More information about the Aptitude-svn-commit
mailing list