From 3a6c4ab1b6fc79a6a543088553cdd6bc8cb0a1dd Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Mon, 21 May 2018 21:10:09 +0300
Subject: Adapt to inventing package_name type

---
 bpkg/pkg-fetch.cxx | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

(limited to 'bpkg/pkg-fetch.cxx')

diff --git a/bpkg/pkg-fetch.cxx b/bpkg/pkg-fetch.cxx
index e157bd9..0ce6d9e 100644
--- a/bpkg/pkg-fetch.cxx
+++ b/bpkg/pkg-fetch.cxx
@@ -22,10 +22,12 @@ using namespace butl;
 
 namespace bpkg
 {
+  // Can return a new selected package object, replacing the existing one.
+  //
   static shared_ptr<selected_package>
   pkg_fetch (dir_path c,
              transaction& t,
-             string n,
+             package_name n,
              version v,
              path a,
              repository_location rl,
@@ -56,6 +58,20 @@ namespace bpkg
       //
       pkg_purge_fs (c, t, p, simulate);
 
+      // Note that if the package name spelling changed then we need to update
+      // it, to make sure that the subsequent commands don't fail and the
+      // diagnostics is not confusing. However, we cannot update the object
+      // id, so have to erase it and persist afterwards.
+      //
+      if (p->name.string () != n.string ())
+      {
+        db.erase (p);
+        p = nullptr;
+      }
+    }
+
+    if (p != nullptr)
+    {
       p->version = move (v);
       p->state = package_state::fetched;
       p->repository_fragment = move (rl);
@@ -100,7 +116,7 @@ namespace bpkg
   static void
   pkg_fetch_check (const dir_path& c,
                    transaction& t,
-                   const string& n,
+                   const package_name& n,
                    bool replace)
   {
     tracer trace ("pkg_fetch_check");
@@ -170,7 +186,7 @@ namespace bpkg
   pkg_fetch (const common_options& co,
              const dir_path& c,
              transaction& t,
-             string n,
+             package_name n,
              version v,
              bool replace,
              bool simulate)
@@ -299,9 +315,9 @@ namespace bpkg
         fail << "package name/version argument expected" <<
           info << "run 'bpkg help pkg-fetch' for more information";
 
-      const char* arg (args.next ());
-      string n (parse_package_name (arg));
-      version v (parse_package_version (arg));
+      const char*  arg (args.next ());
+      package_name n   (parse_package_name (arg));
+      version      v   (parse_package_version (arg));
 
       if (v.empty ())
         fail << "package version expected" <<
-- 
cgit v1.1