diff options
| author |  Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2008-01-22 12:46:23 +0000 |
|---|---|---|
| committer | Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2008-01-22 12:46:23 +0000 |
| commit | 24457af06d3b1e2d3367e869ddc52b1feb694b29 (patch) | |
| tree | 84472a1ef83a273a8813e249d5cf88299e889890 /paludis/repositories/e/vdb_merger.hh | |
| parent | 5d58495bb95b3432aad6f5cb6445906f78845764 (diff) | |
| download | paludis-24457af06d3b1e2d3367e869ddc52b1feb694b29.tar.gz paludis-24457af06d3b1e2d3367e869ddc52b1feb694b29.tar.xz | |
Work around Linux clobbering set*id bits on a rename. Display more information about how we did a merge.
Diffstat (limited to 'paludis/repositories/e/vdb_merger.hh')
| -rw-r--r-- | paludis/repositories/e/vdb_merger.hh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/paludis/repositories/e/vdb_merger.hh b/paludis/repositories/e/vdb_merger.hh index b5a5896ee..e8bf53b54 100644 --- a/paludis/repositories/e/vdb_merger.hh +++ b/paludis/repositories/e/vdb_merger.hh @@ -1,7 +1,7 @@ /* vim: set sw=4 sts=4 et foldmethod=syntax : */ /* - * Copyright (c) 2007 Ciaran McCreesh + * Copyright (c) 2007, 2008 Ciaran McCreesh * * This file is part of the Paludis package manager. Paludis is free software; * you can redistribute it and/or modify it under the terms of the GNU General @@ -42,6 +42,7 @@ namespace paludis { private: void display_override(const std::string &) const; + std::string make_arrows(const MergeStatusFlags &) const; public: ///\name Basic operations @@ -54,9 +55,9 @@ namespace paludis virtual Hook extend_hook(const Hook &); - virtual void record_install_file(const FSEntry &, const FSEntry &, const std::string &); - virtual void record_install_dir(const FSEntry &, const FSEntry &); - virtual void record_install_sym(const FSEntry &, const FSEntry &); + virtual void record_install_file(const FSEntry &, const FSEntry &, const std::string &, const MergeStatusFlags &); + virtual void record_install_dir(const FSEntry &, const FSEntry &, const MergeStatusFlags &); + virtual void record_install_sym(const FSEntry &, const FSEntry &, const MergeStatusFlags &); virtual void on_error(bool is_check, const std::string &); virtual void on_warn(bool is_check, const std::string &); |