diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-08-26 12:03:13 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-08-26 12:03:13 -0400 |
| commit | 5cc4517590d4d517bf9e29db5d9c5e03e4e0ad26 (patch) | |
| tree | ec8a7c9d7e449e192258b167d727e03f36a2b851 /guix | |
| parent | bc0506f5b75812431e8530e213ca642028743f9e (diff) | |
| parent | c2815c0f46d16b98559d0498ae683b0e36e25e7a (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/nar.scm | 3 | ||||
| -rw-r--r-- | guix/profiles.scm | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/guix/nar.scm b/guix/nar.scm index 0a7187c2dd..b95cbd648d 100644 --- a/guix/nar.scm +++ b/guix/nar.scm @@ -324,8 +324,7 @@ held." (rename-file source target) ;; Register TARGET. As a side effect, it resets the timestamps of all - ;; its files, recursively. However, it doesn't attempt to deduplicate - ;; its files like 'importPaths' does (FIXME). + ;; its files, recursively, and runs a deduplication pass. (register-path target #:references references #:deriver deriver)) diff --git a/guix/profiles.scm b/guix/profiles.scm index bf86624e43..a2c73fd4cd 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -393,7 +393,7 @@ MANIFEST." (define (info-files top) (let ((infodir (string-append top "/share/info"))) (map (cut string-append infodir "/" <>) - (scandir infodir info-file?)))) + (or (scandir infodir info-file?) '())))) (define (install-info info) (zero? |