aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-04-11 18:25:42 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-04-11 18:25:42 +0000
commitd88fcf09f2c0616acd0d1c8c09fbc1ef4efe2eed (patch)
tree5f4728e0cfaf23721761d059e2d38af95baa2bc5
parent28a771a53b1c3aef0ce1c222e1594cb228c15864 (diff)
downloadpaludis-d88fcf09f2c0616acd0d1c8c09fbc1ef4efe2eed.tar.gz
paludis-d88fcf09f2c0616acd0d1c8c09fbc1ef4efe2eed.tar.xz
Fix dir over sym to non dir error message. Fixes: ticket:190
-rw-r--r--paludis/merger/merger.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/paludis/merger/merger.cc b/paludis/merger/merger.cc
index d4b45ad..8078340 100644
--- a/paludis/merger/merger.cc
+++ b/paludis/merger/merger.cc
@@ -468,7 +468,8 @@ Merger::on_dir_over_sym(bool is_check, const FSEntry & src, const FSEntry & dst)
record_install_dir(src, dst);
}
else
- on_error(is_check, "Expected '" + stringify(dst) + "' to be a directory but found a symlink to a non-directory");
+ on_error(is_check, "Expected '" + stringify(dst / src.basename()) +
+ "' to be a directory but found a symlink to a non-directory");
}
void