chiark / gitweb /
~ianmdlvl / fdroidserver.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9f95c0b 5d54b76)
Merge branch 'p1' into 'master'
authorDaniel Martí <mvdan@mvdan.cc>
Sun, 28 Feb 2016 13:37:17 +0000 (13:37 +0000)
committerDaniel Martí <mvdan@mvdan.cc>
Sun, 28 Feb 2016 13:37:17 +0000 (13:37 +0000)
commitbf3247743344edf676a51c568cc35f6f0bdc95e5
tree183cf7c8d850b7af619ff30fd64141c9c8c3fc94tree | snapshot
parent9f95c0bbdb48a552606a5f6e3826d0d044a7ab02commit | diff
parent5d54b761af7378f1a00084676c1f8c83addf2912commit | diff
Merge branch 'p1' into 'master'

Fix pubkey extraction on update

Replacement of !86.

Fix pubkey extraction in case of non-empty _JAVA_OPTIONS. Fixes #133.

I didn't actually run the test suite (it looks like there are some preparations to be done for that), but I checked the commands from `test_fdroid_popen_stderr_redirect` in ipython.

See merge request !103
fdroidserver/common.py diff1 | diff2 | blob | history
fdroidserver/update.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.