[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] package: allow users to upgrade the whole system by not providin
From: |
Cyril Roelandt |
Subject: |
[PATCH] package: allow users to upgrade the whole system by not providing a regexp. |
Date: |
Tue, 16 Apr 2013 00:17:11 +0200 |
'guix package --upgrade' is now the same as "guix package --upgrade=''".
---
doc/guix.texi | 7 ++++---
guix/scripts/package.scm | 6 +++---
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index c91bc20..d69b7d0 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -537,9 +537,10 @@ multiple-output package.
@itemx -r @var{package}
Remove @var{package}.
address@hidden address@hidden
address@hidden -u @var{regexp}
-Upgrade all the installed packages matching @var{regexp}.
address@hidden address@hidden
address@hidden -u address@hidden
+Upgrade all the installed packages. When @var{regexp} is specified, upgrade
only
+installed packages whose name matches @var{regexp}.
Note that this upgrades package to the latest version of packages found
in the distribution currently installed. To update your distribution,
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index ac99d16..5b340c6 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -328,7 +328,7 @@ Install, remove, or upgrade PACKAGES in a single
transaction.\n"))
(display (_ "
-r, --remove=PACKAGE remove PACKAGE"))
(display (_ "
- -u, --upgrade=REGEXP upgrade all the installed packages matching REGEXP"))
+ -u, --upgrade[=REGEXP] upgrade all the installed packages matching REGEXP"))
(display (_ "
--roll-back roll back to the previous generation"))
(newline)
@@ -379,7 +379,7 @@ Install, remove, or upgrade PACKAGES in a single
transaction.\n"))
(option '(#\r "remove") #t #f
(lambda (opt name arg result)
(alist-cons 'remove arg result)))
- (option '(#\u "upgrade") #t #f
+ (option '(#\u "upgrade") #f #t
(lambda (opt name arg result)
(alist-cons 'upgrade arg result)))
(option '("roll-back") #f #f
@@ -602,7 +602,7 @@ Install, remove, or upgrade PACKAGES in a single
transaction.\n"))
(let* ((installed (manifest-packages (profile-manifest profile)))
(upgrade-regexps (filter-map (match-lambda
(('upgrade . regexp)
- (make-regexp regexp))
+ (make-regexp (or regexp "")))
(_ #f))
opts))
(upgrade (if (null? upgrade-regexps)
--
1.7.10.4