From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 9 Sep 2022 22:04:02 +0000 (-0500)
Subject: autoconf: store autom4te request keys in sorted order
X-Git-Tag: v2.72c~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2ab755698db245898a4cc89149eb5df256e4bd0;p=thirdparty%2Fautoconf.git

autoconf: store autom4te request keys in sorted order

Notced unstable key order when debugging unrelated bug.
Data::Dumper's SortKeys() makes ordering stable and decreases
diffs from run to run. No functional change otherwise.

* lib/Autom4te/C4che.pm
* lib/Autom4te/Request.pm: Sort request keys in serialization.

Copyright-paperwork-exempt: yes
---

diff --git a/lib/Autom4te/C4che.pm b/lib/Autom4te/C4che.pm
index 8b7c3c11..e9561809 100644
--- a/lib/Autom4te/C4che.pm
+++ b/lib/Autom4te/C4che.pm
@@ -158,7 +158,7 @@ sub marshall ($)
   my $res = '';
 
   my $marshall = Data::Dumper->new ([\@request], [qw (*request)]);
-  $marshall->Indent(2)->Terse(0);
+  $marshall->Indent(2)->Terse(0)->Sortkeys(1);
   $res = $marshall->Dump . "\n";
 
   return $res;
diff --git a/lib/Autom4te/Request.pm b/lib/Autom4te/Request.pm
index c137ef21..1b922f7d 100644
--- a/lib/Autom4te/Request.pm
+++ b/lib/Autom4te/Request.pm
@@ -63,7 +63,7 @@ sub marshall($)
 
   # CALLER is an object: instance method.
   my $marshall = Data::Dumper->new ([$caller]);
-  $marshall->Indent(2)->Terse(0);
+  $marshall->Indent(2)->Terse(0)->Sortkeys(1);
   $res = $marshall->Dump . "\n";
 
   return $res;