diff options
| author |  Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2011-03-18 22:29:53 +0000 |
|---|---|---|
| committer | Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2011-03-18 22:29:53 +0000 |
| commit | 6930097bad9a7b32291aff543692a67887199e0e (patch) | |
| tree | e6d9eb36f77aad7521262e1d9be70fb02b7abe53 | |
| parent | 42db10c0978d93a45350861b1d7290e470bfec5d (diff) | |
| download | paludis-6930097bad9a7b32291aff543692a67887199e0e.tar.gz paludis-6930097bad9a7b32291aff543692a67887199e0e.tar.xz | |
Avoid ping pong calls
| -rw-r--r-- | paludis/repositories/e/e_repository.cc | 2 | ||||
| -rw-r--r-- | paludis/repositories/e/exheres_layout.cc | 5 | ||||
| -rw-r--r-- | paludis/repositories/e/exheres_layout.hh | 4 | ||||
| -rw-r--r-- | paludis/repositories/e/layout.hh | 4 | ||||
| -rw-r--r-- | paludis/repositories/e/traditional_layout.cc | 5 | ||||
| -rw-r--r-- | paludis/repositories/e/traditional_layout.hh | 4 |
6 files changed, 8 insertions, 16 deletions
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc index 9538620ea..0aec4df8e 100644 --- a/paludis/repositories/e/e_repository.cc +++ b/paludis/repositories/e/e_repository.cc @@ -1859,7 +1859,7 @@ ERepository::merge(const MergeParams & m) if (0 != compress_process.run().wait()) throw ActionFailedError("Compressing tarball failed"); - FSPath binary_ebuild_location(layout()->binary_ebuild_location( + FSPath binary_ebuild_location(layout()->binary_ebuild_directory(m.package_id()->name()) / binary_ebuild_name( m.package_id()->name(), m.package_id()->version(), "pbin-1+" + std::static_pointer_cast<const ERepositoryID>(m.package_id())->eapi()->name())); diff --git a/paludis/repositories/e/exheres_layout.cc b/paludis/repositories/e/exheres_layout.cc index a37879cad..5cc01c789 100644 --- a/paludis/repositories/e/exheres_layout.cc +++ b/paludis/repositories/e/exheres_layout.cc @@ -620,10 +620,9 @@ ExheresLayout::manifest_files(const QualifiedPackageName & qpn) const } FSPath -ExheresLayout::binary_ebuild_location(const QualifiedPackageName & q, const VersionSpec & v, - const std::string & eapi) const +ExheresLayout::binary_ebuild_directory(const QualifiedPackageName & q) const { - return package_directory(q) / _imp->repository->binary_ebuild_name(q, v, eapi); + return package_directory(q); } std::shared_ptr<MetadataValueKey<FSPath> > diff --git a/paludis/repositories/e/exheres_layout.hh b/paludis/repositories/e/exheres_layout.hh index 8ea3b2b93..3d2309111 100644 --- a/paludis/repositories/e/exheres_layout.hh +++ b/paludis/repositories/e/exheres_layout.hh @@ -86,9 +86,7 @@ namespace paludis virtual FSPath category_directory(const CategoryNamePart &) const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual FSPath binary_ebuild_location(const QualifiedPackageName &, const VersionSpec &, - const std::string & eapi) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + virtual FSPath binary_ebuild_directory(const QualifiedPackageName &) const PALUDIS_ATTRIBUTE((warn_unused_result)); virtual std::shared_ptr<const FSPathSequence> arch_list_files() const PALUDIS_ATTRIBUTE((warn_unused_result)); diff --git a/paludis/repositories/e/layout.hh b/paludis/repositories/e/layout.hh index c43c29617..f6b55d0b6 100644 --- a/paludis/repositories/e/layout.hh +++ b/paludis/repositories/e/layout.hh @@ -108,9 +108,7 @@ namespace paludis virtual FSPath category_directory(const CategoryNamePart &) const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0; - virtual FSPath binary_ebuild_location(const QualifiedPackageName &, const VersionSpec &, - const std::string & eapi) const - PALUDIS_ATTRIBUTE((warn_unused_result)) = 0; + virtual FSPath binary_ebuild_directory(const QualifiedPackageName &) const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0; virtual std::shared_ptr<const FSPathSequence> arch_list_files() const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0; diff --git a/paludis/repositories/e/traditional_layout.cc b/paludis/repositories/e/traditional_layout.cc index 4dda29db7..b057b027b 100644 --- a/paludis/repositories/e/traditional_layout.cc +++ b/paludis/repositories/e/traditional_layout.cc @@ -636,10 +636,9 @@ TraditionalLayout::sync_filter_file() const } FSPath -TraditionalLayout::binary_ebuild_location(const QualifiedPackageName & q, const VersionSpec & v, - const std::string & eapi) const +TraditionalLayout::binary_ebuild_directory(const QualifiedPackageName & q) const { - return package_directory(q) / _imp->repository->binary_ebuild_name(q, v, eapi); + return package_directory(q); } std::shared_ptr<MetadataValueKey<FSPath> > diff --git a/paludis/repositories/e/traditional_layout.hh b/paludis/repositories/e/traditional_layout.hh index 2385e5bc7..6376494cd 100644 --- a/paludis/repositories/e/traditional_layout.hh +++ b/paludis/repositories/e/traditional_layout.hh @@ -87,9 +87,7 @@ namespace paludis virtual FSPath category_directory(const CategoryNamePart &) const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual FSPath binary_ebuild_location(const QualifiedPackageName &, const VersionSpec &, - const std::string & eapi) const - PALUDIS_ATTRIBUTE((warn_unused_result)); + virtual FSPath binary_ebuild_directory(const QualifiedPackageName &) const PALUDIS_ATTRIBUTE((warn_unused_result)); virtual std::shared_ptr<const FSPathSequence> arch_list_files() const PALUDIS_ATTRIBUTE((warn_unused_result)); |