summaryrefslogtreecommitdiff
path: root/guix/scripts/pack.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/pack.scm
parent1c7a78f157062c796f6779da645be6212d6cd592 (diff)
downloadguix-patches-69daee23af49aeafcb1d250c90860f9253da719e.tar
guix-patches-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/pack.scm')
-rw-r--r--guix/scripts/pack.scm26
1 files changed, 13 insertions, 13 deletions
diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index 165e4ccf2a..1595be1f52 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -71,7 +71,7 @@ found."
(($ <compressor> name*)
(string=? name* name)))
%compressors)
- (leave (_ "~a: compressor not found~%") name)))
+ (leave (G_ "~a: compressor not found~%") name)))
(define* (self-contained-tarball name profile
#:key target
@@ -307,7 +307,7 @@ the image."
`((,source -> ,target) ,@symlinks)
(alist-delete 'symlinks result eq?))))
(x
- (leave (_ "~a: invalid symlink specification~%")
+ (leave (G_ "~a: invalid symlink specification~%")
arg)))))
(option '("localstatedir") #f #f
(lambda (opt name arg result)
@@ -317,30 +317,30 @@ the image."
%standard-build-options)))
(define (show-help)
- (display (_ "Usage: guix pack [OPTION]... PACKAGE...
+ (display (G_ "Usage: guix pack [OPTION]... PACKAGE...
Create a bundle of PACKAGE.\n"))
(show-build-options-help)
(newline)
(show-transformation-options-help)
(newline)
- (display (_ "
+ (display (G_ "
-f, --format=FORMAT build a pack in the given FORMAT"))
- (display (_ "
+ (display (G_ "
-e, --expression=EXPR consider the package EXPR evaluates to"))
- (display (_ "
+ (display (G_ "
-s, --system=SYSTEM attempt to build for SYSTEM--e.g., \"i686-linux\""))
- (display (_ "
+ (display (G_ "
--target=TRIPLET cross-build for TRIPLET--e.g., \"armel-linux-gnu\""))
- (display (_ "
+ (display (G_ "
-C, --compression=TOOL compress using TOOL--e.g., \"lzip\""))
- (display (_ "
+ (display (G_ "
-S, --symlink=SPEC create symlinks to the profile according to SPEC"))
- (display (_ "
+ (display (G_ "
--localstatedir include /var/guix in the resulting pack"))
(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))
@@ -379,7 +379,7 @@ Create a bundle of PACKAGE.\n"))
(build-image (match (assq-ref %formats pack-format)
((? procedure? proc) proc)
(#f
- (leave (_ "~a: unknown pack format")
+ (leave (G_ "~a: unknown pack format")
format))))
(localstatedir? (assoc-ref opts 'localstatedir?)))
(with-store store