aboutsummaryrefslogtreecommitdiff
path: root/paludis/ndbam_merger.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-03-21 13:13:59 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-03-21 13:13:59 +0000
commitef30feada12c02381e32b649b132e6a6c5efaf25 (patch)
tree25e069e0a7a8dcacaee95ba53856570b075ad122 /paludis/ndbam_merger.cc
parentedb238fcd23455460b8011da94290c0127d53d8d (diff)
downloadpaludis-ef30feada12c02381e32b649b132e6a6c5efaf25.tar.gz
paludis-ef30feada12c02381e32b649b132e6a6c5efaf25.tar.xz
importare --install-under
Diffstat (limited to 'paludis/ndbam_merger.cc')
-rw-r--r--paludis/ndbam_merger.cc10
1 files changed, 10 insertions, 0 deletions
diff --git a/paludis/ndbam_merger.cc b/paludis/ndbam_merger.cc
index 39f9a5fff..5025cf6d3 100644
--- a/paludis/ndbam_merger.cc
+++ b/paludis/ndbam_merger.cc
@@ -70,6 +70,7 @@ NDBAMMerger::NDBAMMerger(const NDBAMMergerParams & p) :
(k::image(), p.image)
(k::root(), p.root)
(k::no_chown(), ! getenv_with_default("PALUDIS_NO_CHOWN", "").empty())
+ (k::install_under(), p.install_under)
(k::options(), p.options)),
PrivateImplementationPattern<NDBAMMerger>(new Implementation<NDBAMMerger>(p))
{
@@ -172,6 +173,15 @@ NDBAMMerger::record_install_dir(const FSEntry & src, const FSEntry & dst_dir, co
}
void
+NDBAMMerger::record_install_under_dir(const FSEntry & dst, const MergeStatusFlags & flags)
+{
+ std::string tidy(stringify(dst.strip_leading(_imp->realroot)));
+ display_override(make_arrows(flags) + " [dir] " + tidy);
+
+ *_imp->contents_file << "type=dir path=" << escape(tidy) << std::endl;
+}
+
+void
NDBAMMerger::record_install_sym(const FSEntry & src, const FSEntry & dst_dir, const MergeStatusFlags & flags)
{
std::string tidy(stringify((dst_dir / src.basename()).strip_leading(_imp->realroot)));