Make */*::foo-> fast again

2 files changed, 24 insertions, 2 deletions

diff --git a/paludis/repositories/e/ebuild_id.cc b/paludis/repositories/e/ebuild_id.cc
index 542b42e17..88be9dd86 100644
--- a/paludis/repositories/e/ebuild_id.cc
+++ b/paludis/repositories/e/ebuild_id.cc
@@ -814,8 +814,13 @@ EbuildID::installed_time_key() const
 const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
 EbuildID::from_repositories_key() const
 {
-    need_keys_added();
-    return _imp->generated_from;
+    if (might_be_binary())
+    {
+        need_keys_added();
+        return _imp->generated_from;
+    }
+    else
+        return make_null_shared_ptr();
 }
 
 const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
@@ -1539,3 +1544,18 @@ EbuildID::purge_invalid_cache() const
     }
 }
 
+bool
+EbuildID::might_be_binary() const
+{
+    auto path(stringify(_imp->ebuild));
+    auto dot_pos(path.rfind('.'));
+
+    if (std::string::npos != dot_pos)
+    {
+        auto extension(path.substr(dot_pos + 1));
+        return 0 == extension.compare(0, 4, "pbin");
+    }
+    else
+        return false;
+}
+
diff --git a/paludis/repositories/e/ebuild_id.hh b/paludis/repositories/e/ebuild_id.hh
index e6cd41845..2bd96f6ce 100644
--- a/paludis/repositories/e/ebuild_id.hh
+++ b/paludis/repositories/e/ebuild_id.hh
@@ -166,6 +166,8 @@ namespace paludis
                 virtual void add_build_options(const std::shared_ptr<Choices> &) const;
 
                 virtual void purge_invalid_cache() const;
+
+                bool might_be_binary() const;
         };
     }
 }