aboutsummaryrefslogtreecommitdiff
path: root/paludis/fs_merger.hh
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2012-01-14 21:27:47 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2012-01-14 21:33:27 +0000
commit95bd57bb886a5673bd690760b0041f70e1c11b11 (patch)
tree43fa58145a65d5b4bc3d3c9d1ea392e0e4bb90ce /paludis/fs_merger.hh
parent77cd8163e95257f9aaf4fc40aa3ea5c42bc6cd26 (diff)
downloadpaludis-95bd57bb886a5673bd690760b0041f70e1c11b11.tar.gz
paludis-95bd57bb886a5673bd690760b0041f70e1c11b11.tar.xz
Allow some FSMerger warnings to be fatal
Diffstat (limited to 'paludis/fs_merger.hh')
-rw-r--r--paludis/fs_merger.hh8
1 files changed, 8 insertions, 0 deletions
diff --git a/paludis/fs_merger.hh b/paludis/fs_merger.hh
index 6d6036d4f..9843528c0 100644
--- a/paludis/fs_merger.hh
+++ b/paludis/fs_merger.hh
@@ -50,6 +50,7 @@ namespace paludis
{
typedef Name<struct name_environment> environment;
typedef Name<struct name_fix_mtimes_before> fix_mtimes_before;
+ typedef Name<struct name_fs_merger_options> fs_merger_options;
typedef Name<struct name_get_new_ids_or_minus_one> get_new_ids_or_minus_one;
typedef Name<struct name_image> image;
typedef Name<struct name_install_under> install_under;
@@ -82,6 +83,13 @@ namespace paludis
*/
NamedValue<n::fix_mtimes_before, Timestamp> fix_mtimes_before;
+ /**
+ * Additional options not in MergerOptions.
+ *
+ * \since 0.71
+ */
+ NamedValue<n::fs_merger_options, FSMergerOptions> fs_merger_options;
+
NamedValue<n::get_new_ids_or_minus_one, std::function<std::pair<uid_t, gid_t> (const FSPath &)> > get_new_ids_or_minus_one;
NamedValue<n::image, FSPath> image;
NamedValue<n::install_under, FSPath> install_under;