From 46137ddb2a7bab4ee1e67ea36c4f72dae25341a6 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Mon, 5 Mar 2018 12:30:26 +0300
Subject: Rename bpkg repository type to pkg

---
 load/load.cxx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'load')

diff --git a/load/load.cxx b/load/load.cxx
index f57ed0b..44cfe0e 100644
--- a/load/load.cxx
+++ b/load/load.cxx
@@ -117,7 +117,7 @@ load_repositories (path p)
       try
       {
         r.location = repository_location (repository_url (tl[i].value),
-                                          repository_type::bpkg);
+                                          repository_type::pkg);
       }
       catch (const invalid_argument& e)
       {
@@ -166,7 +166,7 @@ load_repositories (path p)
 
             r.cache_location = repository_location (
               repository_url (cache_path.string ()),
-              repository_type::bpkg);
+              repository_type::pkg);
 
             // Created from the absolute path repository location can not be
             // other than absolute.
@@ -318,7 +318,7 @@ load_packages (const shared_ptr<repository>& rp, database& db)
   //
   assert (!rp->cache_location.empty ());
 
-  bpkg_package_manifests pkm;
+  pkg_package_manifests pkm;
   path p (rp->cache_location.path () / packages);
 
   try
@@ -327,7 +327,7 @@ load_packages (const shared_ptr<repository>& rp, database& db)
     rp->packages_timestamp = file_mtime (p);
 
     manifest_parser mp (ifs, p.string ());
-    pkm = bpkg_package_manifests (mp);
+    pkm = pkg_package_manifests (mp);
   }
   catch (const io_error& e)
   {
@@ -477,7 +477,7 @@ load_repositories (const shared_ptr<repository>& rp, database& db)
   //
   assert (db.find<repository> (rp->name) != nullptr);
 
-  bpkg_repository_manifests rpm;
+  pkg_repository_manifests rpm;
 
   path p (rp->cache_location.path () / repositories);
 
@@ -487,7 +487,7 @@ load_repositories (const shared_ptr<repository>& rp, database& db)
     rp->repositories_timestamp = file_mtime (p);
 
     manifest_parser mp (ifs, p.string ());
-    rpm = bpkg_repository_manifests (mp);
+    rpm = pkg_repository_manifests (mp);
   }
   catch (const io_error& e)
   {
@@ -576,7 +576,7 @@ load_repositories (const shared_ptr<repository>& rp, database& db)
     {
       // Absolute path location make no sense for the web interface.
       //
-      if (rm.location.type () != repository_type::bpkg ||
+      if (rm.location.type () != repository_type::pkg ||
           rm.location.absolute ())
         bad_location ();
 
-- 
cgit v1.1