diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2018-07-05 14:00:39 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2018-07-05 14:00:39 +0300 |
| commit | 57621f681bbba48aee65f5a8d629d7aae527635b (patch) | |
| tree | edbf13177db40dc018174e163b27a130d241cced | |
| parent | 9be433ac34057a2c9c1757ec41f8b3f6361f98dc (diff) | |
Adapt to prerequisite repository type guessing rules change
| -rw-r--r-- | bpkg/repository-types.cli | 2 | ||||
| -rw-r--r-- | doc/manual.cli | 5 | ||||
| -rw-r--r-- | tests/rep-fetch.test | 10 |
3 files changed, 10 insertions, 7 deletions
diff --git a/bpkg/repository-types.cli b/bpkg/repository-types.cli index 37ea28a..f0e07be 100644 --- a/bpkg/repository-types.cli +++ b/bpkg/repository-types.cli @@ -48,7 +48,7 @@ repositories. See \l{bpkg#manifest-repository-list Repository List Manifest} for details on the format and semantics of this file. -\h|GIR REPOSITORIES| +\h|GIT REPOSITORIES| A \cb{git} repository is \i{version control}-based. That is, it normally contains multiple versions of the same package (but can also contain several, diff --git a/doc/manual.cli b/doc/manual.cli index 5e2effe..3f05aa0 100644 --- a/doc/manual.cli +++ b/doc/manual.cli @@ -1117,11 +1117,6 @@ both contexts, the \cb{.git} extension should be ignored if the local prerequisite repository with the extension does not exist while the one without the extension does. -For the \cb{dir} repository type the relative location may also contain the -URL fragment to make the same repository information usable in case the base -and prerequisites are also exposed as \cb{git} repositories. For the \cb{dir} -repository type such a fragment is ignored. - While POSIX systems normally only support POSIX paths (that is, forward slashes only), Windows is generally able to handle both slash types. As a result, it is recommended that POSIX paths are always used in the \c{location} diff --git a/tests/rep-fetch.test b/tests/rep-fetch.test index 9543045..bcbf2cf 100644 --- a/tests/rep-fetch.test +++ b/tests/rep-fetch.test @@ -458,7 +458,15 @@ if ($remote != true) { rep_add += --type dir - rep = $canonicalize([dir_path] $out_git/state0) + rep = $~/state0 + +cp -r $out_git/state0 $rep + + +cat <<EOI >= $rep/libbar.git/repositories.manifest + : 1 + role: prerequisite + type: dir + location: ../style-basic.git + EOI +$clone_cfg && $rep_add $rep/libbar.git |