summaryrefslogtreecommitdiff
path: root/guix/scripts/environment.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/environment.scm
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/environment.scm')
-rw-r--r--guix/scripts/environment.scm42
1 files changed, 21 insertions, 21 deletions
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index 5a6abd00fb..0b2b964bf7 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -132,45 +132,45 @@ and an output string."
(package->bag package)))))
(define (show-help)
- (display (_ "Usage: guix environment [OPTION]... PACKAGE... [-- COMMAND...]
+ (display (G_ "Usage: guix environment [OPTION]... PACKAGE... [-- COMMAND...]
Build an environment that includes the dependencies of PACKAGE and execute
COMMAND or an interactive shell in that environment.\n"))
- (display (_ "
+ (display (G_ "
-e, --expression=EXPR create environment for the package that EXPR
evaluates to"))
- (display (_ "
+ (display (G_ "
-l, --load=FILE create environment for the package that the code within
FILE evaluates to"))
- (display (_ "
+ (display (G_ "
--ad-hoc include all specified packages in the environment instead
of only their inputs"))
- (display (_ "
+ (display (G_ "
--pure unset existing environment variables"))
- (display (_ "
+ (display (G_ "
--search-paths display needed environment variable definitions"))
- (display (_ "
+ (display (G_ "
-s, --system=SYSTEM attempt to build for SYSTEM--e.g., \"i686-linux\""))
- (display (_ "
+ (display (G_ "
-r, --root=FILE make FILE a symlink to the result, and register it
as a garbage collector root"))
- (display (_ "
+ (display (G_ "
-C, --container run command within an isolated container"))
- (display (_ "
+ (display (G_ "
-N, --network allow containers to access the network"))
- (display (_ "
+ (display (G_ "
--share=SPEC for containers, share writable host file system
according to SPEC"))
- (display (_ "
+ (display (G_ "
--expose=SPEC for containers, expose read-only host file system
according to SPEC"))
- (display (_ "
+ (display (G_ "
--bootstrap use bootstrap binaries to build the environment"))
(newline)
(show-build-options-help)
(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))
@@ -501,16 +501,16 @@ Otherwise, return the derivation for the Bash package."
"Check if containers can be created and exit with an informative error
message if any test fails."
(unless (user-namespace-supported?)
- (report-error (_ "cannot create container: user namespaces unavailable\n"))
- (leave (_ "is your kernel version < 3.10?\n")))
+ (report-error (G_ "cannot create container: user namespaces unavailable\n"))
+ (leave (G_ "is your kernel version < 3.10?\n")))
(unless (unprivileged-user-namespace-supported?)
- (report-error (_ "cannot create container: unprivileged user cannot create user namespaces\n"))
- (leave (_ "please set /proc/sys/kernel/unprivileged_userns_clone to \"1\"\n")))
+ (report-error (G_ "cannot create container: unprivileged user cannot create user namespaces\n"))
+ (leave (G_ "please set /proc/sys/kernel/unprivileged_userns_clone to \"1\"\n")))
(unless (setgroups-supported?)
- (report-error (_ "cannot create container: /proc/self/setgroups does not exist\n"))
- (leave (_ "is your kernel version < 3.19?\n"))))
+ (report-error (G_ "cannot create container: /proc/self/setgroups does not exist\n"))
+ (leave (G_ "is your kernel version < 3.19?\n"))))
(define (register-gc-root target root)
"Make ROOT an indirect root to TARGET. This is procedure is idempotent."