diff options
| author |  David Leverton <levertond@googlemail.com>
| 2008-02-11 01:40:51 +0000 |
|---|---|---|
| committer | David Leverton <levertond@googlemail.com>
| 2008-02-11 01:40:51 +0000 |
| commit | 7f5da5c6222c2311500886d61be1ed729078fdf4 (patch) | |
| tree | 4a0b4ded406fedd0284680f47d6143cb633fa858 /paludis/repositories/fake | |
| parent | 5f182fcbdc18a66abf61733d2149c5b34c96d9eb (diff) | |
| download | paludis-7f5da5c6222c2311500886d61be1ed729078fdf4.tar.gz paludis-7f5da5c6222c2311500886d61be1ed729078fdf4.tar.xz | |
Allow empty directory merge warning to be made an error, and do so for exheres-0.
Diffstat (limited to 'paludis/repositories/fake')
| -rw-r--r-- | paludis/repositories/fake/fake_installed_repository.cc | 2 | ||||
| -rw-r--r-- | paludis/repositories/fake/fake_installed_repository.hh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/paludis/repositories/fake/fake_installed_repository.cc b/paludis/repositories/fake/fake_installed_repository.cc index 1d1f86c2b..262f4d78d 100644 --- a/paludis/repositories/fake/fake_installed_repository.cc +++ b/paludis/repositories/fake/fake_installed_repository.cc @@ -133,7 +133,7 @@ FakeInstalledRepository::want_pre_post_phases() const } void -FakeInstalledRepository::merge(const MergeOptions &) +FakeInstalledRepository::merge(const MergeParams &) { } diff --git a/paludis/repositories/fake/fake_installed_repository.hh b/paludis/repositories/fake/fake_installed_repository.hh index 04508246a..6a99f9a4a 100644 --- a/paludis/repositories/fake/fake_installed_repository.hh +++ b/paludis/repositories/fake/fake_installed_repository.hh @@ -50,7 +50,7 @@ namespace paludis virtual bool want_pre_post_phases() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void merge(const MergeOptions &); + virtual void merge(const MergeParams &); /* RepositoryProvidesInterface */ |