nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pull: Use ~/.cache/guix/checkouts instead of ~/.cache/guix/pull. 

Previously 'channel-news-for-commit' would use the former while 'guix
pull' would use the latter.  Consequently, the first 'guix pull -N'
would clone the repository anew.

* guix/scripts/pull.scm (guix-pull): Remove 'cache', and leave
%REPOSITORY-CACHE-DIRECTORY to its default value.
This commit is contained in:
Ludovic Courtès 2019-09-23 23:38:59 +02:00
parent 46a9d88512
commit 7b3f56f5d7
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
guix/scripts/pull.scm
View File

@ -764,7 +764,6 @@ Use '~/.config/guix/channels.scm' instead."))
(with-git-error-handling (with-git-error-handling
(let* ((opts (parse-command-line args %options (let* ((opts (parse-command-line args %options
(list %default-options))) (list %default-options)))
(cache (string-append (cache-directory) "/pull"))
(channels (channel-list opts)) (channels (channel-list opts))
(profile (or (assoc-ref opts 'profile) %current-profile))) (profile (or (assoc-ref opts 'profile) %current-profile)))
(cond ((assoc-ref opts 'query) (cond ((assoc-ref opts 'query)
@ -776,8 +775,7 @@ Use '~/.config/guix/channels.scm' instead."))
(ensure-default-profile) (ensure-default-profile)
(with-status-verbosity (assoc-ref opts 'verbosity) (with-status-verbosity (assoc-ref opts 'verbosity)
(parameterize ((%current-system (assoc-ref opts 'system)) (parameterize ((%current-system (assoc-ref opts 'system))
(%graft? (assoc-ref opts 'graft?)) (%graft? (assoc-ref opts 'graft?)))
(%repository-cache-directory cache))
(set-build-options-from-command-line store opts) (set-build-options-from-command-line store opts)
(honor-x509-certificates store) (honor-x509-certificates store)