[javatools] 01/01: jh_depends: Set LC_ALL when calling 'sort' to improve the reproducibility

[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 fd35d8eed7341977b050cf4cadbb4f0360616d55
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jul 27 23:55:40 2016 +0200

    jh_depends: Set LC_ALL when calling 'sort' to improve the reproducibility
---
 debian/changelog       | 7 +++++++
 java-propose-classpath | 4 ++--
 jh_depends             | 6 +++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ac96693..a958982 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+javatools (0.57) unstable; urgency=medium
+
+  * Team upload.
+  * jh_depends: Set LC_ALL when calling 'sort' to improve the reproducibility
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 27 Jul 2016 23:55:15 +0200
+
 javatools (0.56) unstable; urgency=medium
 
   * Team upload.
diff --git a/java-propose-classpath b/java-propose-classpath
index fc303f4..ee21cf0 100755
--- a/java-propose-classpath
+++ b/java-propose-classpath
@@ -30,7 +30,7 @@ dodepends()
 `readlink -f "$j"`"
       done
    fi
-   echo "$realdepends" | sort -biu | xargs
+   echo "$realdepends" | LC_ALL=C sort -biu | xargs
 }
 
 ARGS="c" parseargs "$@"
@@ -54,7 +54,7 @@ else
       cd "$TEMPDIR"
       jar xf "$JAR" >/dev/null
 
-      classes="`find -name '*.class' -exec jcf-dump --print-constants java.lang.Object \{\} \; | grep 'Class name:' | cut -d'"' -f2| sed 's/\[\[*L\(.*\);/\1/;s/$/.class/' |sort -u | grep -v ^java[/\.]`"
+      classes="`find -name '*.class' -exec jcf-dump --print-constants java.lang.Object \{\} \; | grep 'Class name:' | cut -d'"' -f2| sed 's/\[\[*L\(.*\);/\1/;s/$/.class/' | LC_ALL=C sort -u | grep -v ^java[/\.]`"
 
       cd "$OLDDIR"
       rm -rf "$TEMPDIR"
diff --git a/jh_depends b/jh_depends
index c137ce7..fe9aa15 100755
--- a/jh_depends
+++ b/jh_depends
@@ -140,7 +140,7 @@ for p in $PACKAGES; do
       fi
       [ -n "$TEMPDIR" ] && rm -rf "$TEMPDIR/"*
    done
-   JARDEPS=`echo $JARDEPS | xargs -n1 | sort -u`
+   JARDEPS=`echo $JARDEPS | xargs -n1 | LC_ALL=C sort -u`
 
    if [ -n "$VERBOSE" ]; then
       echo "Found Jars:" $JARDEPS
@@ -179,7 +179,7 @@ for p in $PACKAGES; do
    done
 
    if [ -n "$NEWJARDEPS" ]; then
-      DEBDEPS="$DEBDEPS `dpkg -S $NEWJARDEPS 2>/dev/null | grep -v ^$p: | cut -d: -f1 | sort -u`"
+      DEBDEPS="$DEBDEPS `dpkg -S $NEWJARDEPS 2>/dev/null | grep -v ^$p: | cut -d: -f1 | LC_ALL=C sort -u`"
    fi
 
    REALDEBDEPS=""
@@ -191,7 +191,7 @@ for p in $PACKAGES; do
       fi
    done
    DEBDEPS="$LOCALDEBDEPS $REALDEBDEPS"
-   DEBDEPS=`echo $DEBDEPS | xargs -n1 | sort -u`
+   DEBDEPS=`echo $DEBDEPS | xargs -n1 | LC_ALL=C sort -u`
 
    if [ -n "$VERBOSE" ]; then
       echo "Found Debs:" $DEBDEPS

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