aboutsummaryrefslogtreecommitdiff
path: root/guix/scripts/pull.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-05-03 15:57:02 +0200
committerLudovic Courtès <ludo@gnu.org>2017-05-03 16:16:17 +0200
commit69daee23af49aeafcb1d250c90860f9253da719e (patch)
tree28961e4843b0a992b9cdd414ef1501f997a1bdeb /guix/scripts/pull.scm
parent1c7a78f157062c796f6779da645be6212d6cd592 (diff)
downloadgnu-guix-69daee23af49aeafcb1d250c90860f9253da719e.tar
gnu-guix-69daee23af49aeafcb1d250c90860f9253da719e.tar.gz
ui: Rename '_' to 'G_'.
This avoids collisions with '_' when the latter is used as a 'match' pattern for instance. See <https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00464.html>. * guix/ui.scm: Rename '_' to 'G_'. * po/guix/Makevars (XGETTEXT_OPTIONS): Adjust accordingly. * build-aux/compile-all.scm (warnings): Remove 'format'. * gnu/packages.scm, gnu/services.scm, gnu/services/shepherd.scm, gnu/system.scm, gnu/system/shadow.scm, guix/gnupg.scm, guix/http-client.scm, guix/import/cpan.scm, guix/import/elpa.scm, guix/import/pypi.scm, guix/nar.scm, guix/scripts.scm, guix/scripts/archive.scm, guix/scripts/authenticate.scm, guix/scripts/build.scm, guix/scripts/challenge.scm, guix/scripts/container.scm, guix/scripts/container/exec.scm, guix/scripts/copy.scm, guix/scripts/download.scm, guix/scripts/edit.scm, guix/scripts/environment.scm, guix/scripts/gc.scm, guix/scripts/graph.scm, guix/scripts/hash.scm, guix/scripts/import.scm, guix/scripts/import/cpan.scm, guix/scripts/import/cran.scm, guix/scripts/import/crate.scm, guix/scripts/import/elpa.scm, guix/scripts/import/gem.scm, guix/scripts/import/gnu.scm, guix/scripts/import/hackage.scm, guix/scripts/import/nix.scm, guix/scripts/import/pypi.scm, guix/scripts/import/stackage.scm, guix/scripts/lint.scm, guix/scripts/offload.scm, guix/scripts/pack.scm, guix/scripts/package.scm, guix/scripts/perform-download.scm, guix/scripts/publish.scm, guix/scripts/pull.scm, guix/scripts/refresh.scm, guix/scripts/size.scm, guix/scripts/substitute.scm, guix/scripts/system.scm, guix/ssh.scm, guix/upstream.scm: Use 'G_' instead of '_'. Most of this change was obtained by running: "sed -i -e's/(_ "/(G_ "/g' `find -name \*.scm`".
Diffstat (limited to 'guix/scripts/pull.scm')
-rw-r--r--guix/scripts/pull.scm26
1 files changed, 13 insertions, 13 deletions
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index 8e31ad620c..82fcaa248c 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -75,18 +75,18 @@
`((tarball-url . ,%snapshot-url)))
(define (show-help)
- (display (_ "Usage: guix pull [OPTION]...
+ (display (G_ "Usage: guix pull [OPTION]...
Download and deploy the latest version of Guix.\n"))
- (display (_ "
+ (display (G_ "
--verbose produce verbose output"))
- (display (_ "
+ (display (G_ "
--url=URL download the Guix tarball from URL"))
- (display (_ "
+ (display (G_ "
--bootstrap use the bootstrap Guile to build the new Guix"))
(newline)
- (display (_ "
+ (display (G_ "
-h, --help display this help and exit"))
- (display (_ "
+ (display (G_ "
-V, --version display version information and exit"))
(newline)
(show-bug-report-information))
@@ -153,7 +153,7 @@ store file name."
(mbegin %store-monad
(what-to-build (list tar gzip))
(built-derivations (list tar gzip))
- (format #t (_ "unpacking '~a'...~%") tarball)
+ (format #t (G_ "unpacking '~a'...~%") tarball)
(let ((source (temporary-directory)))
(with-directory-excursion source
@@ -205,24 +205,24 @@ contained therein."
(if (and (file-exists? latest)
(string=? (readlink latest) source-dir))
(begin
- (display (_ "Guix already up to date\n"))
+ (display (G_ "Guix already up to date\n"))
(return #t))
(begin
(switch-symlinks latest source-dir)
(format #t
- (_ "updated ~a successfully deployed under `~a'~%")
+ (G_ "updated ~a successfully deployed under `~a'~%")
%guix-package-name latest)
(return #t))))
- (leave (_ "failed to update Guix, check the build log~%")))))
+ (leave (G_ "failed to update Guix, check the build log~%")))))
(define (guix-pull . args)
(define (parse-options)
;; Return the alist of option values.
(args-fold* args %options
(lambda (opt name arg result)
- (leave (_ "~A: unrecognized option~%") name))
+ (leave (G_ "~A: unrecognized option~%") name))
(lambda (arg result)
- (leave (_ "~A: unexpected argument~%") arg))
+ (leave (G_ "~A: unexpected argument~%") arg))
%default-options))
(define (use-le-certs? url)
@@ -245,7 +245,7 @@ contained therein."
(fetch-tarball store url)))
(fetch-tarball store url))))
(unless tarball
- (leave (_ "failed to download up-to-date source, exiting\n")))
+ (leave (G_ "failed to download up-to-date source, exiting\n")))
(parameterize ((%guile-for-build
(package-derivation store
(if (assoc-ref opts 'bootstrap?)