aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2018-02-13 23:36:33 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2018-02-14 20:06:31 +0300
commitc1fd7f8b685ba359fc99c9579c3234d560342424 (patch)
treea661fc487bd65e455497d3570464ea9fdae2dbd4
parent55ce3cfd66dd0fc09db938cdbda4e5238bf01ab1 (diff)
Adapt to package/repository manifests API change
-rw-r--r--load/load.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/load/load.cxx b/load/load.cxx
index 2b12ee1..f57ed0b 100644
--- a/load/load.cxx
+++ b/load/load.cxx
@@ -318,7 +318,7 @@ load_packages (const shared_ptr<repository>& rp, database& db)
//
assert (!rp->cache_location.empty ());
- package_manifests pkm;
+ bpkg_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 = package_manifests (mp);
+ pkm = bpkg_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);
- repository_manifests rpm;
+ bpkg_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 = repository_manifests (mp);
+ rpm = bpkg_repository_manifests (mp);
}
catch (const io_error& e)
{
@@ -576,14 +576,14 @@ load_repositories (const shared_ptr<repository>& rp, database& db)
{
// Absolute path location make no sense for the web interface.
//
- if (rm.location.absolute ())
+ if (rm.location.type () != repository_type::bpkg ||
+ rm.location.absolute ())
bad_location ();
// Convert the relative repository location to remote one, leave remote
// location unchanged.
//
- rl = repository_location (repository_url (rm.location.string ()),
- rp->location);
+ rl = repository_location (rm.location, rp->location);
}
catch (const invalid_argument&)
{