diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-07-07 01:18:18 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-07-07 01:18:18 +0200 |
| commit | 36175a3a9eb5bd4096de4e06e1f6b0e8cd895d84 (patch) | |
| tree | 7c2d8dd2267b2dc533d5f59acc137641e2325e52 /guix/store.scm | |
| parent | 42dcfca4cc424aa790d8fb62eb327782fd08aad7 (diff) | |
| parent | c72647fbae675654e32e17a6891980a7b9272a71 (diff) | |
| download | guix-36175a3a9eb5bd4096de4e06e1f6b0e8cd895d84.tar guix-36175a3a9eb5bd4096de4e06e1f6b0e8cd895d84.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'guix/store.scm')
| -rw-r--r-- | guix/store.scm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/guix/store.scm b/guix/store.scm index 52940ff751..d7c603898c 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -1802,11 +1802,12 @@ connection, and return the result." (call-with-values (lambda () (run-with-state mval store)) (lambda (result new-store) - ;; Copy the object cache from NEW-STORE so we don't fully discard the - ;; state. - (let ((cache (store-connection-object-cache new-store))) - (set-store-connection-object-cache! store cache) - result))))) + (when (and store new-store) + ;; Copy the object cache from NEW-STORE so we don't fully discard + ;; the state. + (let ((cache (store-connection-object-cache new-store))) + (set-store-connection-object-cache! store cache))) + result)))) ;;; |