aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-02-02 16:27:55 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-02-02 16:27:55 +0000
commita5d40f88ff2e5452adb6e1b6f1d73b0bac7efde0 (patch)
tree91450c8d11ba03ebfb0c8bcda82e23fa513778c2 /src
parentdb6f0b1425ee62088bd290b3ae684ea2d51ff1ad (diff)
downloadpaludis-a5d40f88ff2e5452adb6e1b6f1d73b0bac7efde0.tar.gz
paludis-a5d40f88ff2e5452adb6e1b6f1d73b0bac7efde0.tar.xz
Start switching over from sr to kc.
Diffstat (limited to 'src')
-rw-r--r--src/clients/accerso/accerso.cc17
-rw-r--r--src/output/console_install_task.cc11
2 files changed, 15 insertions, 13 deletions
diff --git a/src/clients/accerso/accerso.cc b/src/clients/accerso/accerso.cc
index ca245fc..b5c15f3 100644
--- a/src/clients/accerso/accerso.cc
+++ b/src/clients/accerso/accerso.cc
@@ -31,6 +31,7 @@
#include <paludis/util/map.hh>
#include <paludis/util/tr1_functional.hh>
#include <paludis/util/visitor-impl.hh>
+#include <paludis/util/kc.hh>
#include <paludis/environments/no_config/no_config_environment.hh>
#include <paludis/package_database.hh>
#include <paludis/query.hh>
@@ -125,9 +126,9 @@ main(int argc, char *argv[])
try
{
- FetchAction a(FetchActionOptions::create()
- .safe_resume(true)
- .fetch_unneeded(true)
+ FetchAction a(FetchActionOptions::named_create()
+ (k::safe_resume(), true)
+ (k::fetch_unneeded(), true)
);
if ((*i)->supports_action(SupportsActionTest<FetchAction>()))
{
@@ -142,24 +143,24 @@ main(int argc, char *argv[])
for (Sequence<FetchActionFailure>::ConstIterator f(e.failures()->begin()), f_end(e.failures()->end()) ; f != f_end ; ++f)
{
std::string r;
- if (f->requires_manual_fetching)
+ if ((*f)[k::requires_manual_fetching()])
r = "manual";
- if (f->failed_automatic_fetching)
+ if ((*f)[k::failed_automatic_fetching()])
{
if (! r.empty())
r.append(", ");
r.append("could not fetch");
}
- if (! f->failed_integrity_checks.empty())
+ if (! (*f)[k::failed_integrity_checks()].empty())
{
if (! r.empty())
r.append(", ");
- r.append(f->failed_integrity_checks);
+ r.append((*f)[k::failed_integrity_checks()]);
}
- results.insert(std::make_pair(*i, f->target_file + ": " + r));
+ results.insert(std::make_pair(*i, (*f)[k::target_file()] + ": " + r));
}
}
catch (const Exception & e)
diff --git a/src/output/console_install_task.cc b/src/output/console_install_task.cc
index e05c3fb..054a856 100644
--- a/src/output/console_install_task.cc
+++ b/src/output/console_install_task.cc
@@ -36,6 +36,7 @@
#include <paludis/util/system.hh>
#include <paludis/util/iterator_funcs.hh>
#include <paludis/util/visitor_cast.hh>
+#include <paludis/util/kc.hh>
#include <paludis/query.hh>
#include <paludis/action.hh>
#include <paludis/repository.hh>
@@ -1442,16 +1443,16 @@ ConsoleInstallTask::on_fetch_action_error(const FetchActionError & e)
for (Sequence<FetchActionFailure>::ConstIterator f(e.failures()->begin()), f_end(e.failures()->end()) ;
f != f_end ; ++f)
{
- output_stream() << " * File '" << f->target_file << "': ";
+ output_stream() << " * File '" << (*f)[k::target_file()] << "': ";
bool need_comma(false);
- if (f->requires_manual_fetching)
+ if ((*f)[k::requires_manual_fetching()])
{
output_stream() << "requires manual fetching";
need_comma = true;
}
- if (f->failed_automatic_fetching)
+ if ((*f)[k::failed_automatic_fetching()])
{
if (need_comma)
output_stream() << ", ";
@@ -1459,11 +1460,11 @@ ConsoleInstallTask::on_fetch_action_error(const FetchActionError & e)
need_comma = true;
}
- if (! f->failed_integrity_checks.empty())
+ if (! (*f)[k::failed_integrity_checks()].empty())
{
if (need_comma)
output_stream() << ", ";
- output_stream() << "failed integrity checks: " << f->failed_integrity_checks;
+ output_stream() << "failed integrity checks: " << (*f)[k::failed_integrity_checks()];
need_comma = true;
}