From ad53b2152e10b133165c95f08f218e80f1dd8580 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Wed, 25 Oct 2023 18:14:35 +0300
Subject: Improve pkg-build's 'unable to upgrade package' diagnostics

---
 bpkg/rep-create.cxx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'bpkg/rep-create.cxx')

diff --git a/bpkg/rep-create.cxx b/bpkg/rep-create.cxx
index 67cca95..9b9bdeb 100644
--- a/bpkg/rep-create.cxx
+++ b/bpkg/rep-create.cxx
@@ -24,7 +24,7 @@ using namespace butl;
 
 namespace bpkg
 {
-  struct package_version_key
+  struct package_name_version
   {
     package_name name;
     bpkg::version version;
@@ -34,20 +34,20 @@ namespace bpkg
     // revision.
     //
     bool
-    operator< (const package_version_key& y) const
+    operator< (const package_name_version& y) const
     {
       int r (name.compare (y.name));
       return r < 0 || (r == 0 && version.compare (y.version, true) < 0);
     }
   };
 
-  struct package_version_data
+  struct package_data
   {
     path archive;
     package_manifest manifest;
   };
 
-  using package_map = map<package_version_key, package_version_data>;
+  using package_map = map<package_name_version, package_data>;
 
   static void
   collect (const rep_create_options& o,
@@ -116,8 +116,8 @@ namespace bpkg
       //
       m.location = a.leaf (root);
 
-      package_version_key k {m.name, m.version}; // Argument evaluation order.
-      auto r (map.emplace (move (k), package_version_data {a, move (m)}));
+      package_name_version k {m.name, m.version}; // Argument evaluation order.
+      auto r (map.emplace (move (k), package_data {a, move (m)}));
 
       // Diagnose duplicates.
       //
-- 
cgit v1.1