[Git][java-team/javatools][master] 2 commits: jh_classpath: handle multiple package tmpdirs

[Niels Thykier]

Niels Thykier pushed to branch master at Debian Java Maintainers / javatools


Commits:
0a1b0657 by Apollon Oikonomopoulos at 2019-02-12T09:43:58Z
jh_classpath: handle multiple package tmpdirs

When reading .classpath files, jh_classpath will try to find jars by
relative location first, and fall back to using the *first* package's
tmpdir subsequently. This breaks handling for multi-binary sources where
jars appear in the second or subsequent binary package, as jars will be
searched for in the wrong tmpdir.

Fix this by using the tmpdir corresponding to $package.

- - - - -
efbd8edf by Niels Thykier at 2019-02-12T21:14:11Z
Merge branch 'fix/jh_classpath_tmpdir' into 'master'

jh_classpath: handle multiple package tmpdirs

See merge request java-team/javatools!2
- - - - -


1 changed file:

- jh_classpath


Changes:

=====================================
jh_classpath
=====================================
@@ -102,7 +102,7 @@ if (@ARGV) {
 } else {
 	# read debian/$package.classpath
 	foreach my $package (@{$dh{DOPACKAGES}}) {
-		my $tmpdir = tmpdir($dh{FIRSTPACKAGE});
+		my $tmpdir = tmpdir($package);
 		my $pkgfile = pkgfile($package, 'classpath');
 		if (not $pkgfile and -f 'debian/classpath') {
 			$pkgfile = 'debian/classpath';



View it on GitLab: https://salsa.debian.org/java-team/javatools/compare/2d15b35932b6f2521be463cc287d838ef9f2a9b2...efbd8edf45e354a2e3aa7820b2859bbfa7036627

-- 
View it on GitLab: https://salsa.debian.org/java-team/javatools/compare/2d15b35932b6f2521be463cc287d838ef9f2a9b2...efbd8edf45e354a2e3aa7820b2859bbfa7036627
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20190212/e7ce4072/attachment.html>