I upgraded to latest gnulib in parted and encountered this new failure:
$ make sc_po_check
--- ./po/POTFILES.in
+++ ./po/POTFILES.in
@@ -1,4 +1,3 @@
-debug/clearfat/clearfat.c
lib/argmatch.c
lib/closeout.c
lib/error.c
@@ -9,6 +8,7 @@
lib/version-etc.c
lib/xalloc-die.c
lib/xstrtol-error.c
+debug/clearfat/clearfat.c
libparted/arch/beos.c
libparted/arch/gnu.c
libparted/arch/linux.c
maint.mk: you have changed the set of files with translatable diagnostics;
apply the above patch
make: *** [sc_po_check] Error 1
I've pushed this fix:
>From 36152fb50f3fbb0597793621cbfd10902ac4cf46 Mon Sep 17 00:00:00 2001
From: Jim Meyering <[email protected]>
Date: Sun, 20 Mar 2011 11:31:11 +0100
Subject: [PATCH] maint.mk: sort file names *after* new transformation
* top/maint.mk (sc_po_check): Sorting before removing the $(srcdir)/
prefix would have led to an unwarranted failure in GNU parted.
Sort after that transformation.
---
ChangeLog | 7 +++++++
top/maint.mk | 2 +-
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1b42d3c..269cbf2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-03-20 Jim Meyering <[email protected]>
+
+ maint.mk: sort file names *after* new transformation
+ * top/maint.mk (sc_po_check): Sorting before removing the $(srcdir)/
+ prefix would have led to an unwarranted failure in GNU parted.
+ Sort after that transformation.
+
2011-03-19 Jim Meyering <[email protected]>
maint.mk: fix po-file syntax-check rule
diff --git a/top/maint.mk b/top/maint.mk
index fd192c9..3f7d983 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -976,7 +976,7 @@ sc_po_check:
files="$$files $$file"; \
done; \
grep -E -l '\b(N?_|gettext *)\([^)"]*("|$$)' $$files \
- | sort -u | sed 's|^$(_dot_escaped_srcdir)/||' > $@-2; \
+ | sed 's|^$(_dot_escaped_srcdir)/||' | sort -u > $@-2; \
diff -u -L $(po_file) -L $(po_file) $@-1 $@-2 \
|| { printf '$(ME): '$(fix_po_file_diag) 1>&2; exit 1; }; \
rm -f $@-1 $@-2; \
--
1.7.4.1.499.g53f9
