aboutsummaryrefslogtreecommitdiff
path: root/paludis/ndbam_merger.cc
diff options
context:
space:
mode:
authorAvatar Saleem Abdulrasool <compnerd@compnerd.org> 2013-05-11 14:50:42 -0700
committerAvatar Saleem Abdulrasool <compnerd@compnerd.org> 2013-05-18 14:07:32 -0700
commit26ad9436f05992068b94588fa1692f5a0d2ddb5a (patch)
tree73845ea28d328db8e0e449d110d4453aa9b974cf /paludis/ndbam_merger.cc
parent37ab3e8fce69a97252e371576ddc423eefa3e983 (diff)
downloadpaludis-26ad9436f05992068b94588fa1692f5a0d2ddb5a.tar.gz
paludis-26ad9436f05992068b94588fa1692f5a0d2ddb5a.tar.xz
merger: refactor make_arrows
make_arrows is used to generate indicators for FS mergers. The arrows that are generated are similar for all FS mergers. Permit overriding of the arrow generation in the future if necessary by making the method virtual and hoist it into the base class FSMerger so that it may be shared across the VDB merger as well as the NDBAM merger. Signed-off-by: Saleem Abdulrasool <compnerd@compnerd.org>
Diffstat (limited to 'paludis/ndbam_merger.cc')
-rw-r--r--paludis/ndbam_merger.cc55
1 files changed, 0 insertions, 55 deletions
diff --git a/paludis/ndbam_merger.cc b/paludis/ndbam_merger.cc
index fa7528785..7eed0a2a7 100644
--- a/paludis/ndbam_merger.cc
+++ b/paludis/ndbam_merger.cc
@@ -27,7 +27,6 @@
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/options.hh>
#include <paludis/util/make_named_values.hh>
-#include <paludis/util/enum_iterator.hh>
#include <paludis/util/safe_ofstream.hh>
#include <paludis/util/safe_ifstream.hh>
#include <paludis/util/timestamp.hh>
@@ -305,60 +304,6 @@ NDBAMMerger::make_config_protect_name(const FSPath & src, const FSPath & dst)
return result_name;
}
-std::string
-NDBAMMerger::make_arrows(const FSMergerStatusFlags & flags) const
-{
- std::string result(">>>");
- for (EnumIterator<FSMergerStatusFlag> m, m_end(last_msi) ;
- m != m_end ; ++m)
- {
- if (! flags[*m])
- continue;
-
- switch (*m)
- {
- case msi_unlinked_first:
- result[0] = '<';
- continue;
-
- case msi_used_existing:
- result[0] = '=';
- continue;
-
- case msi_parent_rename:
- result[1] = '^';
- continue;
-
- case msi_rename:
- result[1] = '-';
- continue;
-
- case msi_as_hardlink:
- result[1] = '&';
- continue;
-
- case msi_fixed_ownership:
- result[2] = '~';
- continue;
-
- case msi_setid_bits:
- result[2] = '*';
- continue;
-
- case msi_xattr:
- result[2] = '+';
- continue;
-
- case last_msi:
- break;
- }
-
- throw InternalError(PALUDIS_HERE, "Unhandled MergeStatusFlag '" + stringify(static_cast<long>(*m)) + "'");
- }
-
- return result;
-}
-
void
NDBAMMerger::merge()
{