[Aptitude-svn-commit] r3898 - branches/aptitude-0.3/aptitude/src
Daniel Burrows
dburrows at costa.debian.org
Wed Aug 17 21:17:35 UTC 2005
Author: dburrows
Date: Wed Aug 17 21:17:34 2005
New Revision: 3898
Modified:
branches/aptitude-0.3/aptitude/src/solution_fragment.cc
branches/aptitude-0.3/aptitude/src/solution_fragment.h
branches/aptitude-0.3/aptitude/src/solution_screen.cc
Log:
Move archives() to solution_fragment and eliminate archives_fragment().
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 17 21:17:34 2005
@@ -55,19 +55,26 @@
}
};
-fragment *archives_fragment(const pkgCache::VerIterator &v)
+string archives_text(const pkgCache::VerIterator &ver)
{
- vector<fragment *> archive_fragments;
+ string rval;
+
+ bool is_first = true;
- for(pkgCache::VerFileIterator vf=v.FileList(); !vf.end(); ++vf)
+ for(pkgCache::VerFileIterator vf=ver.FileList(); !vf.end(); ++vf)
{
+ if(is_first)
+ is_first = false;
+ else
+ rval += ", ";
+
if(vf.File().Archive())
- archive_fragments.push_back(text_fragment(vf.File().Archive()));
+ rval += vf.File().Archive();
else
- archive_fragments.push_back(text_fragment(_("<NULL>")));
+ rval += _("<NULL>");
}
- return join_fragments(archive_fragments, L",");
+ return rval;
}
string dep_targets(const pkgCache::DepIterator &start)
@@ -142,9 +149,9 @@
if(a.ver.get_ver().end())
return fragf(_("Removing %s"), a.ver.get_pkg().Name());
else
- return fragf(_("Installing %s %s (%F)"),
+ return fragf(_("Installing %s %s (%s)"),
a.ver.get_pkg().Name(), a.ver.get_ver().VerStr(),
- archives_fragment(a.ver.get_ver()));
+ archives_text(a.ver.get_ver()).c_str());
}
@@ -224,10 +231,10 @@
fragments.push_back(fragf(_("%BInstall%b the following packages:%n")));
for(vector<pkgCache::VerIterator>::const_iterator i=install_packages.begin();
i!=install_packages.end(); ++i)
- fragments.push_back(fragf(" %s [%s (%F)]%n",
+ fragments.push_back(fragf(" %s [%s (%s)]%n",
i->ParentPkg().Name(),
i->VerStr(),
- archives_fragment(*i)));
+ archives_text(*i).c_str()));
fragments.push_back(newline_fragment());
}
@@ -243,10 +250,10 @@
i->Name(),
_("Not Installed")));
else
- fragments.push_back(fragf(" %s [%s (%F)]%n",
+ fragments.push_back(fragf(" %s [%s (%s)]%n",
i->Name(),
i->CurrentVer().VerStr(),
- archives_fragment(i->CurrentVer())));
+ archives_text(i->CurrentVer()).c_str()));
}
fragments.push_back(newline_fragment());
@@ -257,12 +264,12 @@
fragments.push_back(fragf(_("%BUpgrade%b the following packages:%n")));
for(vector<pkgCache::VerIterator>::const_iterator i=upgrade_packages.begin();
i!=upgrade_packages.end(); ++i)
- fragments.push_back(fragf(" %s [%s (%F) -> %s (%F)]%n",
+ fragments.push_back(fragf(" %s [%s (%s) -> %s (%s)]%n",
i->ParentPkg().Name(),
i->ParentPkg().CurrentVer().VerStr(),
- archives_fragment(i->ParentPkg().CurrentVer()),
+ archives_text(i->ParentPkg().CurrentVer()),
i->VerStr(),
- archives_fragment(*i)));
+ archives_text(*i)));
fragments.push_back(newline_fragment());
}
@@ -272,12 +279,12 @@
fragments.push_back(fragf(_("%BDowngrade%b the following packages:%n")));
for(vector<pkgCache::VerIterator>::const_iterator i=downgrade_packages.begin();
i!=downgrade_packages.end(); ++i)
- fragments.push_back(fragf(" %s [%s (%F) -> %s (%F)]%n",
+ fragments.push_back(fragf(" %s [%s (%s) -> %s (%s)]%n",
i->ParentPkg().Name(),
i->ParentPkg().CurrentVer().VerStr(),
- archives_fragment(i->ParentPkg().CurrentVer()),
+ archives_text(i->ParentPkg().CurrentVer()).c_str(),
i->VerStr(),
- archives_fragment(*i)));
+ archives_text(*i).c_str()));
fragments.push_back(newline_fragment());
}
Modified: branches/aptitude-0.3/aptitude/src/solution_fragment.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/solution_fragment.h (original)
+++ branches/aptitude-0.3/aptitude/src/solution_fragment.h Wed Aug 17 21:17:34 2005
@@ -36,10 +36,10 @@
fragment *solution_fragment(const generic_solution<aptitude_universe> &solution);
-/** \return a fragment listing the archives to which a version
+/** \return a list of the archives to which a version
* belongs in the form "archive1,archive2,..."
*/
-fragment *archives_fragment(const pkgCache::VerIterator &v);
+std::string archives_text(const pkgCache::VerIterator &v);
/** \return a fragment describing the given action. */
fragment *action_fragment(const generic_solution<aptitude_universe>::action &a);
Modified: branches/aptitude-0.3/aptitude/src/solution_screen.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/solution_screen.cc (original)
+++ branches/aptitude-0.3/aptitude/src/solution_screen.cc Wed Aug 17 21:17:34 2005
@@ -139,28 +139,6 @@
}
}
-static string archives(const pkgCache::VerIterator &ver)
-{
- string rval;
-
- bool is_first = true;
-
- for(pkgCache::VerFileIterator vf=ver.FileList(); !vf.end(); ++vf)
- {
- if(is_first)
- is_first = false;
- else
- rval += ", ";
-
- if(vf.File().Archive())
- rval += vf.File().Archive();
- else
- rval += _("<NULL>");
- }
-
- return rval;
-}
-
class label_tree : public vs_subtree_generic
{
wstring my_label;
@@ -360,14 +338,14 @@
f = fragf(_("Remove %F [%s (%s)]"),
text_fragment(pkg.Name(), style_attrs_on(A_BOLD)),
pkg.CurrentVer().VerStr(),
- archives(pkg.CurrentVer()).c_str());
+ archives_text(pkg.CurrentVer()).c_str());
break;
case action_install:
f = fragf(_("Install %F [%s (%s)]"),
text_fragment(pkg.Name(), style_attrs_on(A_BOLD)),
ver.get_ver().VerStr(),
- archives(ver.get_ver()).c_str());
+ archives_text(ver.get_ver()).c_str());
break;
case action_keep:
@@ -378,7 +356,7 @@
f = fragf(_("Keep %F at version %s (%s)"),
text_fragment(pkg.Name(), style_attrs_on(A_BOLD)),
ver.get_ver().VerStr(),
- archives(ver.get_ver()).c_str());
+ archives_text(ver.get_ver()).c_str());
break;
@@ -386,16 +364,16 @@
f = fragf(_("Upgrade %F [%s (%s) -> %s (%s)]"),
text_fragment(pkg.Name(), style_attrs_on(A_BOLD)),
pkg.CurrentVer().VerStr(),
- archives(pkg.CurrentVer()).c_str(),
- ver.get_ver().VerStr(), archives(ver.get_ver()).c_str());
+ archives_text(pkg.CurrentVer()).c_str(),
+ ver.get_ver().VerStr(), archives_text(ver.get_ver()).c_str());
break;
case action_downgrade:
f = fragf(_("Downgrade %F [%s (%s) -> %s (%s)]"),
text_fragment(pkg.Name(), style_attrs_on(A_BOLD)),
- pkg.CurrentVer().VerStr(), archives(pkg.CurrentVer()).c_str(),
- ver.get_ver().VerStr(), archives(ver.get_ver()).c_str());
+ pkg.CurrentVer().VerStr(), archives_text(pkg.CurrentVer()).c_str(),
+ ver.get_ver().VerStr(), archives_text(ver.get_ver()).c_str());
break;
}
@@ -508,7 +486,7 @@
righttext = "[UNINST]";
else
righttext = ssprintf("[%s (%s)]",
- dispv.VerStr(), archives(dispv).c_str());
+ dispv.VerStr(), archives_text(dispv).c_str());
}
else
{
@@ -520,7 +498,7 @@
{
righttext += currver.VerStr();
righttext += " ";
- righttext += archives(currver);
+ righttext += archives_text(currver);
}
righttext += " -> ";
@@ -531,7 +509,7 @@
{
righttext += ver.get_ver().VerStr();
righttext += " ";
- righttext += archives(ver.get_ver());
+ righttext += archives_text(ver.get_ver());
}
righttext += "]";
More information about the Aptitude-svn-commit
mailing list