diff options
| author |  David Leverton <levertond@googlemail.com>
| 2007-05-01 18:36:56 +0000 |
|---|---|---|
| committer | David Leverton <levertond@googlemail.com>
| 2007-05-01 18:36:56 +0000 |
| commit | 9fa88c9471a370de91d705f8ff39333971751a38 (patch) | |
| tree | 0b4c2df709741835c5554a5c75899d044ca81371 | |
| parent | 5f0b66f16999de6c4367422da4bb58724c63e418 (diff) | |
| download | paludis-9fa88c9471a370de91d705f8ff39333971751a38.tar.gz paludis-9fa88c9471a370de91d705f8ff39333971751a38.tar.xz | |
Fix messages for non-dir over dir and vice-versa.
| -rw-r--r-- | paludis/merger/merger.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/paludis/merger/merger.cc b/paludis/merger/merger.cc index ffe052c..2c7edfe 100644 --- a/paludis/merger/merger.cc +++ b/paludis/merger/merger.cc @@ -396,7 +396,7 @@ Merger::on_file_over_file(bool is_check, const FSEntry & src, const FSEntry & ds void Merger::on_file_over_dir(bool is_check, const FSEntry & src, const FSEntry & dst) { - on_error(is_check, "Cannot overwrite directory '" + stringify(dst) + "' with file '" + on_error(is_check, "Cannot overwrite directory '" + stringify(dst / src.basename()) + "' with file '" + stringify(src) + "'"); } @@ -435,7 +435,7 @@ Merger::on_dir_over_nothing(bool is_check, const FSEntry & src, const FSEntry & void Merger::on_dir_over_file(bool is_check, const FSEntry & src, const FSEntry & dst) { - on_error(is_check, "Cannot overwrite file '" + stringify(dst) + "' with directory '" + on_error(is_check, "Cannot overwrite file '" + stringify(dst / src.basename()) + "' with directory '" + stringify(src) + "'"); } @@ -508,7 +508,7 @@ Merger::on_sym_over_file(bool is_check, const FSEntry & src, const FSEntry & dst void Merger::on_sym_over_dir(bool is_check, const FSEntry & src, const FSEntry & dst) { - on_error(is_check, "Cannot overwrite directory '" + stringify(dst) + "' with symlink '" + on_error(is_check, "Cannot overwrite directory '" + stringify(dst / src.basename()) + "' with symlink '" + stringify(src) + "'"); } |