diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-06-08 22:46:06 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-06-16 16:10:47 +0200 |
| commit | 5bafc70d1e1daf6a91e8bf29a464263262505f2f (patch) | |
| tree | bd133cebbc08856c3149f648cb5dac18fa0ebd1a /tests | |
| parent | 43badf261f4688c8a7a7a9004a4bff8acb205835 (diff) | |
| download | guix-5bafc70d1e1daf6a91e8bf29a464263262505f2f.tar guix-5bafc70d1e1daf6a91e8bf29a464263262505f2f.tar.gz | |
channels: Make 'validate-pull' call right after clone/pull.
This should come before patching, authentication, etc.
* guix/channels.scm (latest-channel-instance): Add #:validate-pull
parameter and honor it. Return a single value: the instance.
(ensure-forward-channel-update): Change 'instance' parameter to 'commit'
and adjust accordingly.
(latest-channel-instances): Adjust to 'latest-channel-instance' changes.
* guix/scripts/pull.scm (warn-about-backward-updates): Change 'instance'
parameter to 'commit' and adjust accordingly.
* tests/channels.scm ("latest-channel-instances #:validate-pull"):
Likewise.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/channels.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/channels.scm b/tests/channels.scm index 2c857083e9..5f13a48ec1 100644 --- a/tests/channels.scm +++ b/tests/channels.scm @@ -212,12 +212,12 @@ (commit (oid->string (commit-id commit2))))) (old (channel (inherit spec) (commit (oid->string (commit-id commit1)))))) - (define (validate-pull channel current instance relation) + (define (validate-pull channel current commit relation) (return (and (eq? channel old) (string=? (oid->string (commit-id commit2)) current) (string=? (oid->string (commit-id commit1)) - (channel-instance-commit instance)) + commit) relation))) (with-store store |