diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2019-04-30 20:25:19 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2019-05-07 22:50:28 +0300 |
| commit | b26f393c2257c3dfe7937696cd4f307e4075f20c (patch) | |
| tree | ff9d26c2fa6f8bacdc37d18ed37bee9f8564bbe2 /bpkg | |
| parent | 216b2d199bdf3730243795ff71515e636184d98f (diff) | |
Add support for description-type package manifest value
Diffstat (limited to 'bpkg')
| -rw-r--r-- | bpkg/fetch-git.cxx | 3 | ||||
| -rw-r--r-- | bpkg/pkg-verify.cxx | 3 | ||||
| -rw-r--r-- | bpkg/pkg-verify.hxx | 9 | ||||
| -rw-r--r-- | bpkg/rep-create.cxx | 2 |
4 files changed, 10 insertions, 7 deletions
diff --git a/bpkg/fetch-git.cxx b/bpkg/fetch-git.cxx index 7650bf9..63ee09d 100644 --- a/bpkg/fetch-git.cxx +++ b/bpkg/fetch-git.cxx @@ -383,7 +383,8 @@ namespace bpkg return url.string (); #ifndef _WIN32 - // Enforce the 'file://' notation for local URLs (see libpkg/manifest.hxx). + // Enforce the 'file://' notation for local URLs (see + // libbpkg/manifest.hxx). // repository_url u (url.scheme, repository_url::authority_type (), diff --git a/bpkg/pkg-verify.cxx b/bpkg/pkg-verify.cxx index 00a5db0..4dea4fa 100644 --- a/bpkg/pkg-verify.cxx +++ b/bpkg/pkg-verify.cxx @@ -87,7 +87,8 @@ namespace bpkg } return s; - }); + }, + iu); } return m; diff --git a/bpkg/pkg-verify.hxx b/bpkg/pkg-verify.hxx index f3a7c01..7f36e72 100644 --- a/bpkg/pkg-verify.hxx +++ b/bpkg/pkg-verify.hxx @@ -19,10 +19,11 @@ namespace bpkg // Verify archive is a valid package and return its manifest. If requested, // expand the file-referencing manifest values (description, changes, etc), - // setting them to the contents of files they refer to as well as complete - // the dependency constraints. Throw failed if invalid or if something goes - // wrong. If diag is false, then don't issue diagnostics about the reason - // why the package is invalid. + // setting them to the contents of files they refer to, set the potentially + // absent description-type value to the effective description type (see + // libbpkg/manifest.hxx), and complete the dependency constraints. Throw + // failed if invalid or if something goes wrong. If diag is false, then + // don't issue diagnostics about the reason why the package is invalid. // package_manifest pkg_verify (const common_options&, diff --git a/bpkg/rep-create.cxx b/bpkg/rep-create.cxx index 5f8ecf9..9667016 100644 --- a/bpkg/rep-create.cxx +++ b/bpkg/rep-create.cxx @@ -90,7 +90,7 @@ namespace bpkg if (d == root) { if (p == repositories_file || - p == packages_file || + p == packages_file || p == signature_file) continue; } |