aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories
diff options
context:
space:
mode:
authorAvatar Wouter van Kesteren <woutershep@gmail.com> 2015-12-10 23:25:20 +0100
committerAvatar Wouter van Kesteren <woutershep@gmail.com> 2016-01-08 18:59:45 +0100
commitd8b7236f585e5bdcc8446b4cc73a8ec1b32aa887 (patch)
tree2734112e94a6394e70774633c5c9bc94394a8fae /paludis/repositories
parent5cd1f72f94ddc2858ce5612db967ec62db3bed76 (diff)
downloadpaludis-d8b7236f585e5bdcc8446b4cc73a8ec1b32aa887.tar.gz
paludis-d8b7236f585e5bdcc8446b4cc73a8ec1b32aa887.tar.xz
Let merger check dirnames instead of actual dirs
This should be safe because we dont allow empty directories. So installing a directory into an illegal place would error. The moment a keepdir is done it gets a file in it and then we validate this file instead. So this all works out nicely. Change-Id: I205b21d21a08f0e6afa702f0dc28b8f1d54f047b Reviewed-on: https://galileo.mailstation.de/gerrit/4660 Reviewed-by: Bo ├śrsted Andresen <zlin@exherbo.org>
Diffstat (limited to 'paludis/repositories')
-rw-r--r--paludis/repositories/e/permitted_directories.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/paludis/repositories/e/permitted_directories.cc b/paludis/repositories/e/permitted_directories.cc
index 5a178439c..bb2d76f8a 100644
--- a/paludis/repositories/e/permitted_directories.cc
+++ b/paludis/repositories/e/permitted_directories.cc
@@ -51,10 +51,6 @@ PermittedDirectories::add(const FSPath & p, bool b)
bool
PermittedDirectories::permit(const FSPath & p) const
{
- /* otherwise we can't just -/ for "explicit only" */
- if (p == FSPath("/"))
- return true;
-
bool result(true);
for (auto r(_imp->rules.begin()), r_end(_imp->rules.end()) ;