diff options
| -rw-r--r-- | libbrep/common.hxx | 8 | ||||
| -rw-r--r-- | load/load.cxx | 14 | ||||
| -rw-r--r-- | tests/load/driver.cxx | 20 |
3 files changed, 21 insertions, 21 deletions
diff --git a/libbrep/common.hxx b/libbrep/common.hxx index 9fcb5c2..ea74756 100644 --- a/libbrep/common.hxx +++ b/libbrep/common.hxx @@ -213,10 +213,10 @@ namespace brep // using bpkg::repository_location; - #pragma db map type(repository_location) as(string) \ - to((?).url ().string ()) \ - from(brep::repository_location (brep::repository_url (?), \ - brep::repository_type::bpkg)) + #pragma db map type(repository_location) as(string) \ + to((?).url ().string ()) \ + from(brep::repository_location (brep::repository_url (?), \ + brep::repository_type::pkg)) // Version comparison operators. // 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 (); diff --git a/tests/load/driver.cxx b/tests/load/driver.cxx index e58962b..f16c484 100644 --- a/tests/load/driver.cxx +++ b/tests/load/driver.cxx @@ -146,23 +146,23 @@ main (int argc, char* argv[]) assert (db.query<package> ().size () == 17); shared_ptr<repository> sr ( - db.load<repository> ("bpkg:dev.cppget.org/stable")); + db.load<repository> ("pkg:dev.cppget.org/stable")); shared_ptr<repository> mr ( - db.load<repository> ("bpkg:dev.cppget.org/math")); + db.load<repository> ("pkg:dev.cppget.org/math")); shared_ptr<repository> cr ( - db.load<repository> ("bpkg:dev.cppget.org/misc")); + db.load<repository> ("pkg:dev.cppget.org/misc")); shared_ptr<repository> tr ( - db.load<repository> ("bpkg:dev.cppget.org/testing")); + db.load<repository> ("pkg:dev.cppget.org/testing")); shared_ptr<repository> gr ( - db.load<repository> ("bpkg:dev.cppget.org/staging")); + db.load<repository> ("pkg:dev.cppget.org/staging")); // Verify 'stable' repository. // - assert (sr->location.canonical_name () == "bpkg:dev.cppget.org/stable"); + assert (sr->location.canonical_name () == "pkg:dev.cppget.org/stable"); assert (sr->location.string () == "http://dev.cppget.org/1/stable"); assert (sr->display_name == "stable"); @@ -421,7 +421,7 @@ main (int argc, char* argv[]) // Verify 'math' repository. // - assert (mr->location.canonical_name () == "bpkg:dev.cppget.org/math"); + assert (mr->location.canonical_name () == "pkg:dev.cppget.org/math"); assert (mr->location.string () == "http://dev.cppget.org/1/math"); assert (mr->display_name == "math"); @@ -676,7 +676,7 @@ main (int argc, char* argv[]) // Verify 'misc' repository. // - assert (cr->location.canonical_name () == "bpkg:dev.cppget.org/misc"); + assert (cr->location.canonical_name () == "pkg:dev.cppget.org/misc"); assert (cr->location.string () == "http://dev.cppget.org/1/misc"); assert (cr->display_name.empty ()); @@ -736,7 +736,7 @@ main (int argc, char* argv[]) // Verify 'testing' repository. // - assert (tr->location.canonical_name () == "bpkg:dev.cppget.org/testing"); + assert (tr->location.canonical_name () == "pkg:dev.cppget.org/testing"); assert (tr->location.string () == "http://dev.cppget.org/1/testing"); assert (tr->display_name.empty ()); @@ -784,7 +784,7 @@ main (int argc, char* argv[]) // Verify 'staging' repository. // - assert (gr->location.canonical_name () == "bpkg:dev.cppget.org/staging"); + assert (gr->location.canonical_name () == "pkg:dev.cppget.org/staging"); assert (gr->location.string () == "http://dev.cppget.org/1/staging"); assert (gr->display_name.empty ()); |