summaryrefslogtreecommitdiff
path: root/guix/scripts
diff options
context:
space:
mode:
authorAlex Kost <alezost@gmail.com>2016-02-23 11:38:00 +0300
committerAlex Kost <alezost@gmail.com>2016-02-24 18:24:16 +0300
commit6caa4dfa37e9b87336908e188500c14b402a0090 (patch)
tree78cf0419feaf679529de6f9507fc8a51863381a0 /guix/scripts
parent4d459d87347905d7602fbc14cdd786a04c8bf67e (diff)
Do not check package freshness during upgrade.
Fixes <http://bugs.gnu.org/22740>. Reported by Andreas Enge <andreas@enge.fr>. * gnu/packages.scm (waiting, ftp-open*, check-package-freshness): Remove. * guix/scripts/package.scm (options->installable): Adjust accordingly. * emacs/guix-main.scm (package->manifest-entry*): Likewise.
Diffstat (limited to 'guix/scripts')
-rw-r--r--guix/scripts/package.scm12
1 files changed, 4 insertions, 8 deletions
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index b93ffb0b6b..f65834386b 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2013, 2015 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2014 Alex Kost <alezost@gmail.com>
+;;; Copyright © 2014, 2016 Alex Kost <alezost@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -551,10 +551,6 @@ upgrading, #f otherwise."
(define (options->installable opts manifest)
"Given MANIFEST, the current manifest, and OPTS, the result of 'args-fold',
return the new list of manifest entries."
- (define (package->manifest-entry* package output)
- (check-package-freshness package)
- (package->manifest-entry package output))
-
(define upgrade?
(options->upgrade-predicate opts))
@@ -567,7 +563,7 @@ return the new list of manifest entries."
(call-with-values
(lambda ()
(specification->package+output name output))
- package->manifest-entry*))))
+ package->manifest-entry))))
(_ #f))
(manifest-entries manifest)))
@@ -576,13 +572,13 @@ return the new list of manifest entries."
(('install . (? package? p))
;; When given a package via `-e', install the first of its
;; outputs (XXX).
- (package->manifest-entry* p "out"))
+ (package->manifest-entry p "out"))
(('install . (? string? spec))
(if (store-path? spec)
(store-item->manifest-entry spec)
(let-values (((package output)
(specification->package+output spec)))
- (package->manifest-entry* package output))))
+ (package->manifest-entry package output))))
(_ #f))
opts))