aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/e_repository.cc
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/repositories/e/e_repository.cc')
-rw-r--r--paludis/repositories/e/e_repository.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index acd9524ad..eda10b252 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -1889,8 +1889,12 @@ ERepository::merge(const MergeParams & m)
n::tar_file() = _imp->params.binary_distdir() / (bin_dist_base + pbin_tar_extension)
));
- if (! merger.check())
- throw ActionFailedError("Not proceeding with install due to merge sanity check failing");
+ if (m.check())
+ {
+ if (! merger.check())
+ throw ActionFailedError("Not proceeding with install due to merge sanity check failing");
+ return;
+ }
merger.merge();