aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-04-01 00:04:41 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-04-01 00:04:41 +0000
commit6bcc6dcdaa43dd9d76f235b1799f5d4b9bc6085a (patch)
tree868a28b69981c74caf36258c7a93b166726e421b
parent33f5f1072b4fd54f706ff7948cf3ffb8817fe9d1 (diff)
downloadpaludis-6bcc6dcdaa43dd9d76f235b1799f5d4b9bc6085a.tar.gz
paludis-6bcc6dcdaa43dd9d76f235b1799f5d4b9bc6085a.tar.xz
Display progress during vdb merge checks.
-rw-r--r--paludis/repositories/gentoo/vdb_merger.cc17
-rw-r--r--paludis/repositories/gentoo/vdb_merger.hh1
2 files changed, 15 insertions, 3 deletions
diff --git a/paludis/repositories/gentoo/vdb_merger.cc b/paludis/repositories/gentoo/vdb_merger.cc
index aef3ac0..0d6659b 100644
--- a/paludis/repositories/gentoo/vdb_merger.cc
+++ b/paludis/repositories/gentoo/vdb_merger.cc
@@ -142,7 +142,7 @@ VDBMerger::on_error(bool is_check, const std::string & s)
make_check_fail();
if (is_check)
- std::cout << "!!! " << s << std::endl;
+ std::cout << "." << std::endl << "!!! " << s << std::endl;
else
throw MergerError(s);
}
@@ -219,7 +219,18 @@ VDBMerger::merge()
bool
VDBMerger::check()
{
- std::cout << ">>> Checking whether we can merge to " << _imp->options.root << std::endl;
- return Merger::check();
+ std::cout << ">>> Checking whether we can merge to " << _imp->options.root << " ";
+ bool result(Merger::check());
+ std::cout << std::endl;
+ return result;
+}
+
+void
+VDBMerger::on_enter_dir(bool is_check, const FSEntry dir)
+{
+ if (! is_check)
+ return;
+
+ std::cout << ".";
}
diff --git a/paludis/repositories/gentoo/vdb_merger.hh b/paludis/repositories/gentoo/vdb_merger.hh
index 194b2bc..dbefbb0 100644
--- a/paludis/repositories/gentoo/vdb_merger.hh
+++ b/paludis/repositories/gentoo/vdb_merger.hh
@@ -46,6 +46,7 @@ namespace paludis
virtual void on_error(bool is_check, const std::string &);
virtual void on_warn(bool is_check, const std::string &);
+ virtual void on_enter_dir(bool is_check, const FSEntry);
virtual bool config_protected(const FSEntry &, const FSEntry &);
virtual std::string make_config_protect_name(const FSEntry &, const FSEntry &);