mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-11-19 21:30:10 +01:00
fix test_fill_config_defaults_java for non-amd64 arches
This commit is contained in:
parent
24df262f6b
commit
5af5ed2759
@ -2357,7 +2357,7 @@ class CommonTest(unittest.TestCase):
|
|||||||
fdroidserver.common.fill_config_defaults(config)
|
fdroidserver.common.fill_config_defaults(config)
|
||||||
java_paths = []
|
java_paths = []
|
||||||
# use presence of javac to make sure its JDK not just JRE
|
# use presence of javac to make sure its JDK not just JRE
|
||||||
for f in glob.glob('/usr/lib/jvm/java-*-openjdk-amd64/bin/javac'):
|
for f in glob.glob('/usr/lib/jvm/java-*-openjdk-*/bin/javac'):
|
||||||
jdk = os.path.dirname(os.path.dirname(f))
|
jdk = os.path.dirname(os.path.dirname(f))
|
||||||
if not os.path.islink(jdk):
|
if not os.path.islink(jdk):
|
||||||
java_paths.append(jdk)
|
java_paths.append(jdk)
|
||||||
|
Loading…
Reference in New Issue
Block a user