This is an automated email from the git hooks/post-receive script. nthykier pushed a commit to branch master in repository javatools.
commit e4151d2c162ce0c86eeb91c4bcf90fb2fec98cc9 Author: Niels Thykier <[email protected]> Date: Tue Sep 24 13:38:40 2013 +0200 ManifestSection.pm: Ensure fields have a predictable order Signed-off-by: Niels Thykier <[email protected]> --- debian/changelog | 4 ++++ lib/Debian/Javahelper/ManifestSection.pm | 5 +++-- tests/long-out2 | 2 +- tests/onelong-out2 | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8f54008..0b97669 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,10 @@ javatools (0.44) UNRELEASED; urgency=low provide a .jar dependency, not just those with desired-state install. Thanks to Colin Watson for the patch (pulled from Ubuntu's javatools/0.43ubuntu2). + * ManifestSection.pm: Always write fields in a + predictable order. This fixes a FTBFS when the tests + had a different order. Thanks to Damyan Ivanov for + reporting this bug. (Closes: #723884) -- Niels Thykier <[email protected]> Wed, 20 Mar 2013 14:40:31 +0100 diff --git a/lib/Debian/Javahelper/ManifestSection.pm b/lib/Debian/Javahelper/ManifestSection.pm index 4e74aeb..1abc9c6 100644 --- a/lib/Debian/Javahelper/ManifestSection.pm +++ b/lib/Debian/Javahelper/ManifestSection.pm @@ -141,9 +141,10 @@ sub get_values { push(@values, $val) if(defined($val)); } # any order is okay for the rest. - while( my ($name, $val) = each(%$this)){ + for my $name (sort keys(%{$this})) { # we already got these - next if($name eq 'manifest-version' or $name eq 'name'); + next if ($name eq 'manifest-version' or $name eq 'name'); + my $val = $this->{$name}; push(@values, [$val->[0], $val->[1]]); } return @values; diff --git a/tests/long-out2 b/tests/long-out2 index d75df54..6bb887c 100644 --- a/tests/long-out2 +++ b/tests/long-out2 @@ -1,5 +1,4 @@ Manifest-Version: 1.0 -Created-By: 1.6.0_06 (Sun Microsystems Inc.) Class-Path: /usr/share/java/hexdump.jar /usr/share/java/hexdump.jar /usr /share/java/hexdump.jar /usr/share/java/hexdump.jar /usr/share/java/hexd ump.jar /usr/share/java/hexdump.jar /usr/share/java/hexdump.jar /usr/sha @@ -7,5 +6,6 @@ Class-Path: /usr/share/java/hexdump.jar /usr/share/java/hexdump.jar /usr jar /usr/share/java/hexdump.jar /usr/share/java/hexdump.jar /usr/share/j ava/hexdump.jar /usr/share/java/hexdump.jar /usr/share/java/hexdump.jar /usr/share/java/hexdump.jar /usr/share/java/hexdump.jar +Created-By: 1.6.0_06 (Sun Microsystems Inc.) diff --git a/tests/onelong-out2 b/tests/onelong-out2 index 2ebeac0..9e4fa43 100644 --- a/tests/onelong-out2 +++ b/tests/onelong-out2 @@ -1,9 +1,9 @@ Manifest-Version: 1.0 -Created-By: 1.6.0_06 (Sun Microsystems Inc.) Class-Path: /usr/share/java/usr/share/java/usr/share/java/usr/share/java /usr/share/java/usr/share/java/usr/share/java/usr/share/java/usr/share/j ava/usr/share/java/usr/share/java/usr/share/java/usr/share/java/usr/shar e/java/usr/share/java/usr/share/java/usr/share/java/usr/share/java/hexdu mp.jar +Created-By: 1.6.0_06 (Sun Microsystems Inc.) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/javatools.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
