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

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 7b3f56f5d7f4d2bb936e1579ed442e7f5b080abd
Author: Ludovic Courtès <address@hidden>
Date:   Mon Sep 23 23:38:59 2019 +0200

    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.
---
 guix/scripts/pull.scm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index a7fd36f..2b7b991 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)