[libvirt PATCH] build: drop LINUGAS sorting rule

Ján Tomko posted 1 patch 1 year, 5 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/9c690d5a22dfe1f96970751b14239c23a9a72ed4.1666271181.git.jtomko@redhat.com
build-aux/syntax-check.mk | 8 --------
1 file changed, 8 deletions(-)
[libvirt PATCH] build: drop LINUGAS sorting rule
Posted by Ján Tomko 1 year, 5 months ago
A recent merge request from Weblate adding a new file fails syntax-check
because it adds a new language at the end of LINGUAS, instead of sorting
it alphabetically. Rather than trying to work around it, drop this
pointless rule.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
---
 build-aux/syntax-check.mk | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk
index e35c2be734..68cd9dff5f 100644
--- a/build-aux/syntax-check.mk
+++ b/build-aux/syntax-check.mk
@@ -1257,14 +1257,6 @@ sc_po_check:
 	  rm -f $@-1 $@-2; \
 	fi
 
-linguas_file = $(top_srcdir)/po/LINGUAS
-
-sc_linguas_sorting:
-	@sort -u $(linguas_file) > $@-1; \
-	diff -u -L $(linguas_file) -L $(linguas_file) $(linguas_file) $@-1 \
-	  || { echo "$(linguas_file) is not sorted correctly" 1>&2; exit 1; }; \
-	rm -f $@-1
-
 # #if WITH_... will evaluate to false for any non numeric string.
 # That would be flagged by using -Wundef, however gnulib currently
 # tests many undefined macros, and so we can't enable that option.
-- 
2.37.3

Re: [libvirt PATCH] build: drop LINUGAS sorting rule
Posted by Daniel P. Berrangé 1 year, 5 months ago
On Thu, Oct 20, 2022 at 03:06:23PM +0200, Ján Tomko wrote:
> A recent merge request from Weblate adding a new file fails syntax-check
> because it adds a new language at the end of LINGUAS, instead of sorting
> it alphabetically. Rather than trying to work around it, drop this
> pointless rule.
> 
> Signed-off-by: Ján Tomko <jtomko@redhat.com>
> ---
>  build-aux/syntax-check.mk | 8 --------
>  1 file changed, 8 deletions(-)

Reverts 8d160b7979ad2f5dcac79ffe85f79e5c3ae330d6

https://listman.redhat.com/archives/libvir-list/2022-June/232487.html

guess we forgot to actually follow up that time.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [libvirt PATCH] build: drop LINUGAS sorting rule
Posted by Andrea Bolognani 1 year, 5 months ago
On Thu, Oct 20, 2022 at 02:10:51PM +0100, Daniel P. Berrangé wrote:
> On Thu, Oct 20, 2022 at 03:06:23PM +0200, Ján Tomko wrote:
> > A recent merge request from Weblate adding a new file fails syntax-check
> > because it adds a new language at the end of LINGUAS, instead of sorting
> > it alphabetically. Rather than trying to work around it, drop this
> > pointless rule.
> >
> > Signed-off-by: Ján Tomko <jtomko@redhat.com>
> > ---
> >  build-aux/syntax-check.mk | 8 --------
> >  1 file changed, 8 deletions(-)
>
> Reverts 8d160b7979ad2f5dcac79ffe85f79e5c3ae330d6
>
> https://listman.redhat.com/archives/libvir-list/2022-June/232487.html
>
> guess we forgot to actually follow up that time.
>
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

Yup, my bad (twice over). Thanks Jano for taking care of it!

-- 
Andrea Bolognani / Red Hat / Virtualization