diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-09-23 23:38:59 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-09-23 23:41:19 +0200 |
| commit | 7b3f56f5d7f4d2bb936e1579ed442e7f5b080abd (patch) | |
| tree | 211febb6360ac4d6f6a2f14d3c1714ec0940cd89 | |
| parent | 46a9d88512a706f310e91370b6313085da040d2d (diff) | |
| download | guix-7b3f56f5d7f4d2bb936e1579ed442e7f5b080abd.tar guix-7b3f56f5d7f4d2bb936e1579ed442e7f5b080abd.tar.gz | |
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.
| -rw-r--r-- | guix/scripts/pull.scm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index a7fd36fffc..2b7b991b50 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -764,7 +764,6 @@ Use '~/.config/guix/channels.scm' instead.")) (with-git-error-handling (let* ((opts (parse-command-line args %options (list %default-options))) - (cache (string-append (cache-directory) "/pull")) (channels (channel-list opts)) (profile (or (assoc-ref opts 'profile) %current-profile))) (cond ((assoc-ref opts 'query) @@ -776,8 +775,7 @@ Use '~/.config/guix/channels.scm' instead.")) (ensure-default-profile) (with-status-verbosity (assoc-ref opts 'verbosity) (parameterize ((%current-system (assoc-ref opts 'system)) - (%graft? (assoc-ref opts 'graft?)) - (%repository-cache-directory cache)) + (%graft? (assoc-ref opts 'graft?))) (set-build-options-from-command-line store opts) (honor-x509-certificates store) |