diff options
| -rw-r--r-- | paludis/repositories/e/e_repository.cc | 2 | ||||
| -rw-r--r-- | paludis/repositories/e/exheres_layout.cc | 3 | ||||
| -rw-r--r-- | paludis/repositories/e/exheres_layout.hh | 3 | ||||
| -rw-r--r-- | paludis/repositories/e/layout.hh | 3 | ||||
| -rw-r--r-- | paludis/repositories/e/traditional_layout.cc | 3 | ||||
| -rw-r--r-- | paludis/repositories/e/traditional_layout.hh | 3 |
6 files changed, 9 insertions, 8 deletions
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc index bf17eff69..b10ef518e 100644 --- a/paludis/repositories/e/e_repository.cc +++ b/paludis/repositories/e/e_repository.cc @@ -1051,7 +1051,7 @@ ERepository::make_manifest(const QualifiedPackageName & qpn) if (! manifest) throw ERepositoryConfigurationError("Couldn't open Manifest for writing."); - auto files(_imp->layout->manifest_files(qpn)); + auto files(_imp->layout->manifest_files(qpn, package_dir)); for (auto f(files->begin()) ; f != files->end() ; ++f) { diff --git a/paludis/repositories/e/exheres_layout.cc b/paludis/repositories/e/exheres_layout.cc index 4704ab018..edd168124 100644 --- a/paludis/repositories/e/exheres_layout.cc +++ b/paludis/repositories/e/exheres_layout.cc @@ -596,10 +596,9 @@ namespace } std::shared_ptr<Map<FSPath, std::string, FSPathComparator> > -ExheresLayout::manifest_files(const QualifiedPackageName & qpn) const +ExheresLayout::manifest_files(const QualifiedPackageName & qpn, const FSPath & package_dir) const { auto result(std::make_shared<Map<FSPath, std::string, FSPathComparator>>()); - FSPath package_dir = _imp->repository->layout()->package_directory(qpn); std::list<FSPath> package_files((FSIterator(package_dir, { })), FSIterator()); for (std::list<FSPath>::iterator f(package_files.begin()) ; diff --git a/paludis/repositories/e/exheres_layout.hh b/paludis/repositories/e/exheres_layout.hh index 3d2309111..836de833e 100644 --- a/paludis/repositories/e/exheres_layout.hh +++ b/paludis/repositories/e/exheres_layout.hh @@ -120,7 +120,8 @@ namespace paludis virtual std::shared_ptr<const FSPathSequence> licenses_dirs() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<Map<FSPath, std::string, FSPathComparator> > manifest_files(const QualifiedPackageName &) const + virtual std::shared_ptr<Map<FSPath, std::string, FSPathComparator> > manifest_files( + const QualifiedPackageName &, const FSPath &) const PALUDIS_ATTRIBUTE((warn_unused_result)); virtual std::shared_ptr<MetadataValueKey<FSPath> > accounts_repository_data_location_key() const diff --git a/paludis/repositories/e/layout.hh b/paludis/repositories/e/layout.hh index f6b55d0b6..b60ae477d 100644 --- a/paludis/repositories/e/layout.hh +++ b/paludis/repositories/e/layout.hh @@ -143,7 +143,8 @@ namespace paludis virtual std::shared_ptr<const FSPathSequence> licenses_dirs() const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0; - virtual std::shared_ptr<Map<FSPath, std::string, FSPathComparator> > manifest_files(const QualifiedPackageName &) const + virtual std::shared_ptr<Map<FSPath, std::string, FSPathComparator> > manifest_files( + const QualifiedPackageName &, const FSPath &) const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0; virtual std::shared_ptr<MetadataValueKey<FSPath> > accounts_repository_data_location_key() const diff --git a/paludis/repositories/e/traditional_layout.cc b/paludis/repositories/e/traditional_layout.cc index 49b1ea64b..362920402 100644 --- a/paludis/repositories/e/traditional_layout.cc +++ b/paludis/repositories/e/traditional_layout.cc @@ -607,10 +607,9 @@ namespace } std::shared_ptr<Map<FSPath, std::string, FSPathComparator> > -TraditionalLayout::manifest_files(const QualifiedPackageName & qpn) const +TraditionalLayout::manifest_files(const QualifiedPackageName & qpn, const FSPath & package_dir) const { auto result(std::make_shared<Map<FSPath, std::string, FSPathComparator>>()); - FSPath package_dir = _imp->repository->layout()->package_directory(qpn); std::list<FSPath> package_files((FSIterator(package_dir, { fsio_inode_sort, fsio_want_regular_files })), FSIterator()); for (std::list<FSPath>::iterator f(package_files.begin()) ; diff --git a/paludis/repositories/e/traditional_layout.hh b/paludis/repositories/e/traditional_layout.hh index 6376494cd..7647c4a27 100644 --- a/paludis/repositories/e/traditional_layout.hh +++ b/paludis/repositories/e/traditional_layout.hh @@ -122,7 +122,8 @@ namespace paludis virtual std::shared_ptr<const FSPathSequence> licenses_dirs() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual std::shared_ptr<Map<FSPath, std::string, FSPathComparator> > manifest_files(const QualifiedPackageName &) const + virtual std::shared_ptr<Map<FSPath, std::string, FSPathComparator> > manifest_files( + const QualifiedPackageName &, const FSPath &) const PALUDIS_ATTRIBUTE((warn_unused_result)); virtual std::shared_ptr<MetadataValueKey<FSPath> > accounts_repository_data_location_key() const |