summaryrefslogtreecommitdiff
path: root/gnu/packages.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 /gnu/packages.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 'gnu/packages.scm')
-rw-r--r--gnu/packages.scm18
1 files changed, 9 insertions, 9 deletions
diff --git a/gnu/packages.scm b/gnu/packages.scm
index bec8163b2b4..08f1340612d 100644
--- a/gnu/packages.scm
+++ b/gnu/packages.scm
@@ -89,7 +89,7 @@
89 "Search the patch FILE-NAME. Raise an error if not found." 89 "Search the patch FILE-NAME. Raise an error if not found."
90 (or (search-path (%patch-path) file-name) 90 (or (search-path (%patch-path) file-name)
91 (raise (condition 91 (raise (condition
92 (&message (message (format #f (_ "~a: patch not found") 92 (&message (message (format #f (G_ "~a: patch not found")
93 file-name))))))) 93 file-name)))))))
94 94
95(define-syntax-rule (search-patches file-name ...) 95(define-syntax-rule (search-patches file-name ...)
@@ -105,7 +105,7 @@ found."
105 (raise (condition 105 (raise (condition
106 (&message 106 (&message
107 (message 107 (message
108 (format #f (_ "could not find bootstrap binary '~a' \ 108 (format #f (G_ "could not find bootstrap binary '~a' \
109for system '~a'") 109for system '~a'")
110 file-name system))))))) 110 file-name system)))))))
111 111
@@ -157,7 +157,7 @@ returned list is sorted in alphabetical order."
157 result) 157 result)
158 (const #f) ; skip 158 (const #f) ; skip
159 (lambda (path stat errno result) 159 (lambda (path stat errno result)
160 (warning (_ "cannot access `~a': ~a~%") 160 (warning (G_ "cannot access `~a': ~a~%")
161 path (strerror errno)) 161 path (strerror errno))
162 result) 162 result)
163 '() 163 '()
@@ -310,21 +310,21 @@ return its return value."
310 (match (find-best-packages-by-name name version) 310 (match (find-best-packages-by-name name version)
311 ((pkg . pkg*) 311 ((pkg . pkg*)
312 (unless (null? pkg*) 312 (unless (null? pkg*)
313 (warning (_ "ambiguous package specification `~a'~%") spec) 313 (warning (G_ "ambiguous package specification `~a'~%") spec)
314 (warning (_ "choosing ~a@~a from ~a~%") 314 (warning (G_ "choosing ~a@~a from ~a~%")
315 (package-name pkg) (package-version pkg) 315 (package-name pkg) (package-version pkg)
316 (location->string (package-location pkg)))) 316 (location->string (package-location pkg))))
317 (match (package-superseded pkg) 317 (match (package-superseded pkg)
318 ((? package? new) 318 ((? package? new)
319 (info (_ "package '~a' has been superseded by '~a'~%") 319 (info (G_ "package '~a' has been superseded by '~a'~%")
320 (package-name pkg) (package-name new)) 320 (package-name pkg) (package-name new))
321 new) 321 new)
322 (#f 322 (#f
323 pkg))) 323 pkg)))
324 (x 324 (x
325 (if version 325 (if version
326 (leave (_ "~A: package not found for version ~a~%") name version) 326 (leave (G_ "~A: package not found for version ~a~%") name version)
327 (leave (_ "~A: unknown package~%") name))))) 327 (leave (G_ "~A: unknown package~%") name)))))
328 328
329(define (specification->package spec) 329(define (specification->package spec)
330 "Return a package matching SPEC. SPEC may be a package name, or a package 330 "Return a package matching SPEC. SPEC may be a package name, or a package
@@ -352,6 +352,6 @@ version; if SPEC does not specify an output, return OUTPUT."
352 (package 352 (package
353 (if (member sub-drv (package-outputs package)) 353 (if (member sub-drv (package-outputs package))
354 (values package sub-drv) 354 (values package sub-drv)
355 (leave (_ "package `~a' lacks output `~a'~%") 355 (leave (G_ "package `~a' lacks output `~a'~%")
356 (package-full-name package) 356 (package-full-name package)
357 sub-drv)))))) 357 sub-drv))))))