From cd4027fa478e20b59e798dd163a54e7ff9c42c98 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Wed, 22 Jan 2014 17:09:21 +0100
Subject: nar: Add 'restore-file-set', for use by build hooks.

* guix/nar.scm (&nar-invalid-hash-error, &nar-signature-error): New
  condition types.
  (&nar-error): Add 'file' and 'port' fields.
  (&nar-read-error): Remove 'port' and 'file' fields.
  (lock-store-file, unlock-store-file, finalize-store-file,
  temporary-store-directory, restore-file-set): New procedures.
* tests/nar.scm (%seed): New variable.
  (random-text): New procedure.
  ("restore-file-set (signed, valid)", "restore-file-set (missing
  signature)", "restore-file-set (corrupt)"): New tests.
* po/Makevars (XGETTEXT_OPTIONS): Add '--keyword=message'.nar fixes
* po/POTFILES.in: Add guix/nar.scm.
---
 po/Makevars | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'po/Makevars')

diff --git a/po/Makevars b/po/Makevars
index 81fd53ef2c..ade615a452 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -5,11 +5,14 @@ DOMAIN = $(PACKAGE)
 subdir = po
 top_builddir = ..
 
-# These options get passed to xgettext.
-XGETTEXT_OPTIONS =					\
-  --language=Scheme --from-code=UTF-8			\
-  --keyword=_ --keyword=N_				\
-  --keyword=synopsis --keyword=description
+# These options get passed to xgettext.  We want to catch standard
+# gettext uses, package synopses and descriptions, and SRFI-34 error
+# condition messages.
+XGETTEXT_OPTIONS =				\
+  --language=Scheme --from-code=UTF-8		\
+  --keyword=_ --keyword=N_			\
+  --keyword=synopsis --keyword=description	\
+  --keyword=message
 
 COPYRIGHT_HOLDER = Ludovic Courtès
 
-- 
cgit 1.4.1