aboutsummaryrefslogtreecommitdiff
path: root/bpkg/rep-create.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'bpkg/rep-create.cxx')
-rw-r--r--bpkg/rep-create.cxx15
1 files changed, 8 insertions, 7 deletions
diff --git a/bpkg/rep-create.cxx b/bpkg/rep-create.cxx
index c9ee924..9b9bdeb 100644
--- a/bpkg/rep-create.cxx
+++ b/bpkg/rep-create.cxx
@@ -24,7 +24,7 @@ using namespace butl;
namespace bpkg
{
- struct package_version_key
+ struct package_name_version
{
package_name name;
bpkg::version version;
@@ -34,20 +34,20 @@ namespace bpkg
// revision.
//
bool
- operator< (const package_version_key& y) const
+ operator< (const package_name_version& y) const
{
int r (name.compare (y.name));
return r < 0 || (r == 0 && version.compare (y.version, true) < 0);
}
};
- struct package_version_data
+ struct package_data
{
path archive;
package_manifest manifest;
};
- using package_map = map<package_version_key, package_version_data>;
+ using package_map = map<package_name_version, package_data>;
static void
collect (const rep_create_options& o,
@@ -58,7 +58,7 @@ namespace bpkg
{
tracer trace ("collect");
- for (const dir_entry& de: dir_iterator (d, false /* ignore_dangling */))
+ for (const dir_entry& de: dir_iterator (d, dir_iterator::no_follow))
{
path p (de.path ());
@@ -101,6 +101,7 @@ namespace bpkg
pkg_verify (o,
a,
o.ignore_unknown (),
+ o.ignore_unknown () /* ignore_toolchain */,
true /* expand_values */,
true /* load_buildfiles */));
@@ -115,8 +116,8 @@ namespace bpkg
//
m.location = a.leaf (root);
- package_version_key k {m.name, m.version}; // Argument evaluation order.
- auto r (map.emplace (move (k), package_version_data {a, move (m)}));
+ package_name_version k {m.name, m.version}; // Argument evaluation order.
+ auto r (map.emplace (move (k), package_data {a, move (m)}));
// Diagnose duplicates.
//