From a9dcee01b4d4d39d18db60092533dc2985d1c2d4 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Thu, 8 Mar 2018 18:55:41 +0300 Subject: Prefer dir repository type over others for pkg-build --- bpkg/pkg-unpack.cxx | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'bpkg/pkg-unpack.cxx') diff --git a/bpkg/pkg-unpack.cxx b/bpkg/pkg-unpack.cxx index aa3390d..9bd3e03 100644 --- a/bpkg/pkg-unpack.cxx +++ b/bpkg/pkg-unpack.cxx @@ -192,21 +192,17 @@ namespace bpkg if (ap == nullptr) fail << "package " << n << " " << v << " is not available"; - // Pick a directory-based repository. Preferring a local one over the - // remotes seems like a sensible thing to do. + // Pick a directory-based repository. They are always local, so we pick + // the first one. // const package_location* pl (nullptr); for (const package_location& l: ap->locations) { - const repository_location& rl (l.repository.load ()->location); - - if (rl.directory_based () && (pl == nullptr || rl.local ())) + if (l.repository.load ()->location.directory_based ()) { pl = &l; - - if (rl.local ()) - break; + break; } } -- cgit v1.1