[javatools] 02/03: Made the generated MANIFEST.MF files reproducible (Closes: #893504)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository javatools.

commit 80d345a9d7a164a2888513e6351bf5c7cbe89a1b
Author: Chris Lamb <lamby at debian.org>
Date:   Fri Mar 23 22:52:19 2018 +0100

    Made the generated MANIFEST.MF files reproducible (Closes: #893504)
---
 debian/changelog                  |  3 +++
 lib/Debian/Javahelper/Manifest.pm | 14 +++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0c0700e..31ca0f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,9 @@ javatools (0.63) UNRELEASED; urgency=medium
   [ Emmanuel Bourg ]
   * jarwrapper: Removed GCJ support
 
+  [ Chris Lamb ]
+  * Made the generated MANIFEST.MF files reproducible (Closes: #893504)
+
  -- tony mancill <tmancill at debian.org>  Sun, 11 Mar 2018 12:26:55 -0700
 
 javatools (0.62) unstable; urgency=medium
diff --git a/lib/Debian/Javahelper/Manifest.pm b/lib/Debian/Javahelper/Manifest.pm
index 0586cab..f8db5fb 100644
--- a/lib/Debian/Javahelper/Manifest.pm
+++ b/lib/Debian/Javahelper/Manifest.pm
@@ -63,8 +63,8 @@ manifest.
 =item $manifest->get_sections()
 
 Returns a list of all sections in B<$manifest>. The main section will
-always be the first in the list, but the remaining sections can come
-in any order (and this order can change in later invocations).
+always be the first in the list, and the remaining sections will be
+sorted in name order.
 
 Modifying the list will not change which sections are present in
 B<$manifest>, but modifying a section in this list will also update
@@ -114,13 +114,13 @@ sub get_section {
 
 sub get_sections {
     my $this = shift;
-    # There is always a main section.
-    my $main = $this->get_section(MAIN_SECTION, 1);
-    my @sections = ($main);
-    while( my ($name, $sec) = each(%$this) ){
+    my @sections = ();
+    foreach my $name (sort(keys %$this)) {
         next if($name eq MAIN_SECTION);
-        push(@sections, $sec);
+        push(@sections, $this->{$name});
     }
+    # There is always a main section at the front
+    unshift(@sections, $this->get_section(MAIN_SECTION, 1));
     return @sections;
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/javatools.git