chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6fc62fe
)
common: fix JDK detection on latest arch
author
Daniel Martí
<mvdan@mvdan.cc>
Thu, 11 Feb 2016 21:34:44 +0000
(21:34 +0000)
committer
Daniel Martí
<mvdan@mvdan.cc>
Thu, 11 Feb 2016 21:34:44 +0000
(21:34 +0000)
fdroidserver/common.py
patch
|
blob
|
history
diff --git
a/fdroidserver/common.py
b/fdroidserver/common.py
index c30d3b4e07ed7d6492a47351f1959d5e83b395be..f9d04a0e25f921d6bc26edcb47425b35526b4479 100644
(file)
--- a/
fdroidserver/common.py
+++ b/
fdroidserver/common.py
@@
-142,6
+142,7
@@
def fill_config_defaults(thisconfig):
for regex in (r'1\.([6-9])\.0\.jdk', # OSX
r'jdk1\.([6-9])\.0_[0-9]+.jdk', # OSX and Oracle tarball
r'jdk([6-9])-openjdk', # Arch
+ r'java-([6-9])-openjdk', # Arch
r'java-1\.([6-9])\.0-.*', # RedHat
r'java-([6-9])-oracle', # Debian WebUpd8
r'jdk-([6-9])-oracle-.*', # Debian make-jpkg