summaryrefslogtreecommitdiff
path: root/guix/scripts/container
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/container
parent1c7a78f157062c796f6779da645be6212d6cd592 (diff)
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/container')
-rw-r--r--guix/scripts/container/exec.scm16
1 files changed, 8 insertions, 8 deletions
diff --git a/guix/scripts/container/exec.scm b/guix/scripts/container/exec.scm
index d6d267daff..d598f5cac4 100644
--- a/guix/scripts/container/exec.scm
+++ b/guix/scripts/container/exec.scm
@@ -37,12 +37,12 @@
(show-version-and-exit "guix container exec")))))
(define (show-help)
- (display (_ "Usage: guix container exec PID COMMAND [ARGS...]
+ (display (G_ "Usage: guix container exec PID COMMAND [ARGS...]
Execute COMMMAND within the container process PID.\n"))
(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))
@@ -66,7 +66,7 @@ and the other containing arguments for the command to be executed."
(define (guix-container-exec . args)
(define (handle-argument arg result)
(if (assoc-ref result 'pid)
- (leave (_ "~a: extraneous argument~%") arg)
+ (leave (G_ "~a: extraneous argument~%") arg)
(alist-cons 'pid (string->number* arg) result)))
(with-error-handling
@@ -84,13 +84,13 @@ and the other containing arguments for the command to be executed."
'("TERM"))))
(unless pid
- (leave (_ "no pid specified~%")))
+ (leave (G_ "no pid specified~%")))
(when (null? command)
- (leave (_ "no command specified~%")))
+ (leave (G_ "no command specified~%")))
(unless (file-exists? (string-append "/proc/" (number->string pid)))
- (leave (_ "no such process ~d~%") pid))
+ (leave (G_ "no such process ~d~%") pid))
(let ((result (container-excursion pid
(lambda ()
@@ -102,4 +102,4 @@ and the other containing arguments for the command to be executed."
environment)
(apply execlp program program program-args)))))))
(unless (zero? result)
- (leave (_ "exec failed with status ~d~%") result)))))))
+ (leave (G_ "exec failed with status ~d~%") result)))))))