diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-02-09 17:18:48 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-02-09 18:18:41 +0100 |
| commit | 3bea13bb1f571445185d376f76e1785a5777282e (patch) | |
| tree | ff224992451138555296d29c18ff2ac9ede30a56 | |
| parent | cde1e967cfc0849c7010eda0bc700dadf222275f (diff) | |
profiles: Report "pseudo-upgrades" as upgrades, not downgrades.
Reported by Andreas Enge <andreas@enge.fr>
at <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=19764#19>.
* guix/profiles.scm (manifest-transaction-effects): Use 'version>=?'
instead of 'version>?'.
* tests/profiles.scm ("manifest-transaction-effects and
pseudo-upgrades"): New test.
| -rw-r--r-- | guix/profiles.scm | 4 | ||||
| -rw-r--r-- | tests/profiles.scm | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/guix/profiles.scm b/guix/profiles.scm index ac2009154f..a0a259bd4e 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -331,8 +331,8 @@ replace it." (let* ((pattern (manifest-entry->pattern entry)) (previous (manifest-lookup manifest pattern)) (newer? (and previous - (version>? (manifest-entry-version entry) - (manifest-entry-version previous))))) + (version>=? (manifest-entry-version entry) + (manifest-entry-version previous))))) (loop rest (if previous install (cons entry install)) (if (and previous newer?) diff --git a/tests/profiles.scm b/tests/profiles.scm index c210123f74..833b08b455 100644 --- a/tests/profiles.scm +++ b/tests/profiles.scm @@ -169,6 +169,14 @@ (and (null? remove) (null? install) (null? upgrade) (equal? (list (cons guile-2.0.9 guile-1.8.8)) downgrade))))) +(test-assert "manifest-transaction-effects and pseudo-upgrades" + (let* ((m0 (manifest (list guile-2.0.9))) + (t (manifest-transaction (install (list guile-2.0.9))))) + (let-values (((remove install upgrade downgrade) + (manifest-transaction-effects m0 t))) + (and (null? remove) (null? install) (null? downgrade) + (equal? (list (cons guile-2.0.9 guile-2.0.9)) upgrade))))) + (test-assertm "profile-derivation" (mlet* %store-monad ((entry -> (package->manifest-entry %bootstrap-guile)) |