[javatools] 03/08: jh_depends: Strip leading "file://" in class-path

Niels Thykier nthykier at alioth.debian.org
Tue Sep 24 12:06:27 UTC 2013


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

nthykier pushed a commit to branch master
in repository javatools.

commit 5dc41a67f7c48405f69289767a437504f833b5d3
Author: Niels Thykier <niels at thykier.net>
Date:   Tue Sep 24 13:48:17 2013 +0200

    jh_depends: Strip leading "file://" in class-path
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog |    3 +++
 jh_depends       |    2 ++
 2 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0b97669..403c736 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ javatools (0.44) UNRELEASED; urgency=low
     predictable order.  This fixes a FTBFS when the tests
     had a different order.  Thanks to Damyan Ivanov for
     reporting this bug.  (Closes: #723884)
+  * jh_depends: Strip leading "file://" before looking for
+    a jar file.  Thanks to Rene Engelhard for the bug
+    report.  (Closes: #632821)
 
  -- Niels Thykier <niels at thykier.net>  Wed, 20 Mar 2013 14:40:31 +0100
 
diff --git a/jh_depends b/jh_depends
index 7993f7f..5d2786c 100755
--- a/jh_depends
+++ b/jh_depends
@@ -145,6 +145,8 @@ for p in $PACKAGES; do
    DEBDEPS=""
 	NEWJARDEPS=""
    for i in $JARDEPS; do
+       # Strip out leading "file://"
+       i="$(echo "$i" | perl -pe 's{^\s*file://*}{/}')"
 		if [ -e "$i" ]; then 
 			realjar="`readlink -f "$i"`"
 		elif [ -e "/usr/share/java/$i" ]; then

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



More information about the pkg-java-commits mailing list