summaryrefslogtreecommitdiff
path: root/guix/scripts/import
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/import
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/import')
-rw-r--r--guix/scripts/import/cpan.scm14
-rw-r--r--guix/scripts/import/cran.scm16
-rw-r--r--guix/scripts/import/crate.scm14
-rw-r--r--guix/scripts/import/elpa.scm16
-rw-r--r--guix/scripts/import/gem.scm14
-rw-r--r--guix/scripts/import/gnu.scm14
-rw-r--r--guix/scripts/import/hackage.scm24
-rw-r--r--guix/scripts/import/nix.scm10
-rw-r--r--guix/scripts/import/pypi.scm14
-rw-r--r--guix/scripts/import/stackage.scm18
10 files changed, 77 insertions, 77 deletions
diff --git a/guix/scripts/import/cpan.scm b/guix/scripts/import/cpan.scm
index 3d470f684d..77ffe1f38e 100644
--- a/guix/scripts/import/cpan.scm
+++ b/guix/scripts/import/cpan.scm
@@ -38,11 +38,11 @@
'())
(define (show-help)
- (display (_ "Usage: guix import cpan PACKAGE-NAME
+ (display (G_ "Usage: guix import cpan PACKAGE-NAME
Import and convert the CPAN package for PACKAGE-NAME.\n"))
- (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))
@@ -68,7 +68,7 @@ Import and convert the CPAN package for PACKAGE-NAME.\n"))
;; 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)
(alist-cons 'argument arg result))
%default-options))
@@ -83,10 +83,10 @@ Import and convert the CPAN package for PACKAGE-NAME.\n"))
((package-name)
(let ((sexp (cpan->guix-package package-name)))
(unless sexp
- (leave (_ "failed to download meta-data for package '~a'~%")
+ (leave (G_ "failed to download meta-data for package '~a'~%")
package-name))
sexp))
(()
- (leave (_ "too few arguments~%")))
+ (leave (G_ "too few arguments~%")))
((many ...)
- (leave (_ "too many arguments~%"))))))
+ (leave (G_ "too many arguments~%"))))))
diff --git a/guix/scripts/import/cran.scm b/guix/scripts/import/cran.scm
index c9a9eab762..d65c644c05 100644
--- a/guix/scripts/import/cran.scm
+++ b/guix/scripts/import/cran.scm
@@ -40,13 +40,13 @@
'())
(define (show-help)
- (display (_ "Usage: guix import cran PACKAGE-NAME
+ (display (G_ "Usage: guix import cran PACKAGE-NAME
Import and convert the CRAN package for PACKAGE-NAME.\n"))
- (display (_ "
+ (display (G_ "
-a, --archive=ARCHIVE specify the archive repository"))
- (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))
@@ -79,7 +79,7 @@ Import and convert the CRAN package for PACKAGE-NAME.\n"))
;; 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)
(alist-cons 'argument arg result))
%default-options))
@@ -105,10 +105,10 @@ Import and convert the CRAN package for PACKAGE-NAME.\n"))
(let ((sexp (cran->guix-package package-name
(or (assoc-ref opts 'repo) 'cran))))
(unless sexp
- (leave (_ "failed to download description for package '~a'~%")
+ (leave (G_ "failed to download description for package '~a'~%")
package-name))
sexp)))
(()
- (leave (_ "too few arguments~%")))
+ (leave (G_ "too few arguments~%")))
((many ...)
- (leave (_ "too many arguments~%"))))))
+ (leave (G_ "too many arguments~%"))))))
diff --git a/guix/scripts/import/crate.scm b/guix/scripts/import/crate.scm
index 4337a0b623..cab9a4397b 100644
--- a/guix/scripts/import/crate.scm
+++ b/guix/scripts/import/crate.scm
@@ -40,11 +40,11 @@
'())
(define (show-help)
- (display (_ "Usage: guix import crate PACKAGE-NAME
+ (display (G_ "Usage: guix import crate PACKAGE-NAME
Import and convert the crate.io package for PACKAGE-NAME.\n"))
- (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))
@@ -70,7 +70,7 @@ Import and convert the crate.io package for PACKAGE-NAME.\n"))
;; 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)
(alist-cons 'argument arg result))
%default-options))
@@ -85,10 +85,10 @@ Import and convert the crate.io package for PACKAGE-NAME.\n"))
((package-name)
(let ((sexp (crate->guix-package package-name)))
(unless sexp
- (leave (_ "failed to download meta-data for package '~a'~%")
+ (leave (G_ "failed to download meta-data for package '~a'~%")
package-name))
sexp))
(()
- (leave (_ "too few arguments~%")))
+ (leave (G_ "too few arguments~%")))
((many ...)
- (leave (_ "too many arguments~%"))))))
+ (leave (G_ "too many arguments~%"))))))
diff --git a/guix/scripts/import/elpa.scm b/guix/scripts/import/elpa.scm
index b22a7c4c23..34eb16485e 100644
--- a/guix/scripts/import/elpa.scm
+++ b/guix/scripts/import/elpa.scm
@@ -38,13 +38,13 @@
'((repo . gnu)))
(define (show-help)
- (display (_ "Usage: guix import elpa PACKAGE-NAME
+ (display (G_ "Usage: guix import elpa PACKAGE-NAME
Import the latest package named PACKAGE-NAME from an ELPA repository.\n"))
- (display (_ "
+ (display (G_ "
-a, --archive=ARCHIVE specify the archive repository"))
- (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))
@@ -74,7 +74,7 @@ Import the latest package named PACKAGE-NAME from an ELPA repository.\n"))
;; 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)
(alist-cons 'argument arg result))
%default-options))
@@ -89,11 +89,11 @@ Import the latest package named PACKAGE-NAME from an ELPA repository.\n"))
((package-name)
(let ((sexp (elpa->guix-package package-name (assoc-ref opts 'repo))))
(unless sexp
- (leave (_ "failed to download package '~a'~%") package-name))
+ (leave (G_ "failed to download package '~a'~%") package-name))
sexp))
(()
- (leave (_ "too few arguments~%")))
+ (leave (G_ "too few arguments~%")))
((many ...)
- (leave (_ "too many arguments~%"))))))
+ (leave (G_ "too many arguments~%"))))))
;;; elpa.scm ends here
diff --git a/guix/scripts/import/gem.scm b/guix/scripts/import/gem.scm
index a5dd2a7822..349a0a072a 100644
--- a/guix/scripts/import/gem.scm
+++ b/guix/scripts/import/gem.scm
@@ -38,11 +38,11 @@
'())
(define (show-help)
- (display (_ "Usage: guix import gem PACKAGE-NAME
+ (display (G_ "Usage: guix import gem PACKAGE-NAME
Import and convert the RubyGems package for PACKAGE-NAME.\n"))
- (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))
@@ -68,7 +68,7 @@ Import and convert the RubyGems package for PACKAGE-NAME.\n"))
;; 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)
(alist-cons 'argument arg result))
%default-options))
@@ -83,10 +83,10 @@ Import and convert the RubyGems package for PACKAGE-NAME.\n"))
((package-name)
(let ((sexp (gem->guix-package package-name)))
(unless sexp
- (leave (_ "failed to download meta-data for package '~a'~%")
+ (leave (G_ "failed to download meta-data for package '~a'~%")
package-name))
sexp))
(()
- (leave (_ "too few arguments~%")))
+ (leave (G_ "too few arguments~%")))
((many ...)
- (leave (_ "too many arguments~%"))))))
+ (leave (G_ "too many arguments~%"))))))
diff --git a/guix/scripts/import/gnu.scm b/guix/scripts/import/gnu.scm
index 66861f5837..ae98370037 100644
--- a/guix/scripts/import/gnu.scm
+++ b/guix/scripts/import/gnu.scm
@@ -37,18 +37,18 @@
'((key-download . interactive)))
(define (show-help)
- (display (_ "Usage: guix import gnu [OPTION...] PACKAGE
+ (display (G_ "Usage: guix import gnu [OPTION...] PACKAGE
Return a package declaration template for PACKAGE, a GNU package.\n"))
;; '--key-download' taken from (guix scripts refresh).
- (display (_ "
+ (display (G_ "
--key-download=POLICY
handle missing OpenPGP keys according to POLICY:
'always', 'never', and 'interactive', which is also
used when 'key-download' is not specified"))
(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))
@@ -69,7 +69,7 @@ Return a package declaration template for PACKAGE, a GNU package.\n"))
(alist-cons 'key-download (string->symbol arg)
result))
(x
- (leave (_ "unsupported policy: ~a~%")
+ (leave (G_ "unsupported policy: ~a~%")
arg)))))
%standard-import-options))
@@ -83,7 +83,7 @@ Return a package declaration template for PACKAGE, a GNU package.\n"))
;; 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)
(alist-cons 'argument arg result))
%default-options))
@@ -100,6 +100,6 @@ Return a package declaration template for PACKAGE, a GNU package.\n"))
(gnu->guix-package name
#:key-download (assoc-ref opts 'key-download))))
(x
- (leave (_ "wrong number of arguments~%"))))))
+ (leave (G_ "wrong number of arguments~%"))))))
;;; gnu.scm ends here
diff --git a/guix/scripts/import/hackage.scm b/guix/scripts/import/hackage.scm
index f2c20026b6..969f637846 100644
--- a/guix/scripts/import/hackage.scm
+++ b/guix/scripts/import/hackage.scm
@@ -44,23 +44,23 @@
(cabal-environment . ,`(("impl" . ,ghc-default-version)))))
(define (show-help)
- (display (_ "Usage: guix import hackage PACKAGE-NAME
+ (display (G_ "Usage: guix import hackage PACKAGE-NAME
Import and convert the Hackage package for PACKAGE-NAME. If PACKAGE-NAME
includes a suffix constituted by a at-sign followed by a numerical version (as
used with Guix packages), then a definition for the specified version of the
package will be generated. If no version suffix is pecified, then the
generated package definition will correspond to the latest available
version.\n"))
- (display (_ "
+ (display (G_ "
-e ALIST, --cabal-environment=ALIST
specify environment for Cabal evaluation"))
- (display (_ "
+ (display (G_ "
-h, --help display this help and exit"))
- (display (_ "
+ (display (G_ "
-s, --stdin read from standard input"))
- (display (_ "
+ (display (G_ "
-t, --no-test-dependencies don't include test-only dependencies"))
- (display (_ "
+ (display (G_ "
-V, --version display version information and exit"))
(newline)
(show-bug-report-information))
@@ -101,7 +101,7 @@ version.\n"))
;; 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)
(alist-cons 'argument arg result))
%default-options))
@@ -130,18 +130,18 @@ version.\n"))
(()
(run-importer "stdin" opts
(lambda ()
- (leave (_ "failed to import cabal file \
+ (leave (G_ "failed to import cabal file \
from standard input~%")))))
((many ...)
- (leave (_ "too many arguments~%"))))
+ (leave (G_ "too many arguments~%"))))
(match args
((package-name)
(run-importer package-name opts
(lambda ()
- (leave (_ "failed to download cabal file \
+ (leave (G_ "failed to download cabal file \
for package '~a'~%")
package-name))))
(()
- (leave (_ "too few arguments~%")))
+ (leave (G_ "too few arguments~%")))
((many ...)
- (leave (_ "too many arguments~%")))))))
+ (leave (G_ "too many arguments~%")))))))
diff --git a/guix/scripts/import/nix.scm b/guix/scripts/import/nix.scm
index 05e6e4b85d..45ca7e3fcf 100644
--- a/guix/scripts/import/nix.scm
+++ b/guix/scripts/import/nix.scm
@@ -38,11 +38,11 @@
'())
(define (show-help)
- (display (_ "Usage: guix import nix NIXPKGS ATTRIBUTE
+ (display (G_ "Usage: guix import nix NIXPKGS ATTRIBUTE
Import and convert the Nix expression ATTRIBUTE of NIXPKGS.\n"))
- (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))
@@ -68,7 +68,7 @@ Import and convert the Nix expression ATTRIBUTE of NIXPKGS.\n"))
;; 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)
(alist-cons 'argument arg result))
%default-options))
@@ -87,4 +87,4 @@ Import and convert the Nix expression ATTRIBUTE of NIXPKGS.\n"))
(location-file loc) (location-line loc))
expr))
(x
- (leave (_ "wrong number of arguments~%"))))))
+ (leave (G_ "wrong number of arguments~%"))))))
diff --git a/guix/scripts/import/pypi.scm b/guix/scripts/import/pypi.scm
index 7166b014eb..59a925a3ca 100644
--- a/guix/scripts/import/pypi.scm
+++ b/guix/scripts/import/pypi.scm
@@ -38,11 +38,11 @@
'())
(define (show-help)
- (display (_ "Usage: guix import pypi PACKAGE-NAME
+ (display (G_ "Usage: guix import pypi PACKAGE-NAME
Import and convert the PyPI package for PACKAGE-NAME.\n"))
- (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))
@@ -68,7 +68,7 @@ Import and convert the PyPI package for PACKAGE-NAME.\n"))
;; 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)
(alist-cons 'argument arg result))
%default-options))
@@ -83,10 +83,10 @@ Import and convert the PyPI package for PACKAGE-NAME.\n"))
((package-name)
(let ((sexp (pypi->guix-package package-name)))
(unless sexp
- (leave (_ "failed to download meta-data for package '~a'~%")
+ (leave (G_ "failed to download meta-data for package '~a'~%")
package-name))
sexp))
(()
- (leave (_ "too few arguments~%")))
+ (leave (G_ "too few arguments~%")))
((many ...)
- (leave (_ "too many arguments~%"))))))
+ (leave (G_ "too many arguments~%"))))))
diff --git a/guix/scripts/import/stackage.scm b/guix/scripts/import/stackage.scm
index f91b496d24..e6676e93e8 100644
--- a/guix/scripts/import/stackage.scm
+++ b/guix/scripts/import/stackage.scm
@@ -40,16 +40,16 @@
(include-test-dependencies? . #t)))
(define (show-help)
- (display (_ "Usage: guix import stackage PACKAGE-NAME
+ (display (G_ "Usage: guix import stackage PACKAGE-NAME
Import and convert the LTS Stackage package for PACKAGE-NAME.\n"))
- (display (_ "
+ (display (G_ "
-r VERSION, --lts-version=VERSION
specify the LTS version to use"))
- (display (_ "
+ (display (G_ "
-h, --help display this help and exit"))
- (display (_ "
+ (display (G_ "
-t, --no-test-dependencies don't include test-only dependencies"))
- (display (_ "
+ (display (G_ "
-V, --version display version information and exit"))
(newline)
(show-bug-report-information))
@@ -85,7 +85,7 @@ Import and convert the LTS Stackage package for PACKAGE-NAME.\n"))
;; 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)
(alist-cons 'argument arg result))
%default-options))
@@ -105,12 +105,12 @@ Import and convert the LTS Stackage package for PACKAGE-NAME.\n"))
(assoc-ref opts 'include-test-dependencies?)
#:lts-version (assoc-ref opts 'lts-version))))
(unless sexp
- (leave (_ "failed to download cabal file for package '~a'~%")
+ (leave (G_ "failed to download cabal file for package '~a'~%")
package-name))
sexp)))
(()
- (leave (_ "too few arguments~%")))
+ (leave (G_ "too few arguments~%")))
((many ...)
- (leave (_ "too many arguments~%"))))))
+ (leave (G_ "too many arguments~%"))))))
;;; stackage.scm ends here