1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-05 06:50:10 +01:00
Commit Graph

3002 Commits

Author SHA1 Message Date
Hans-Christoph Steiner
d0c767ce5e only move GPG signature if APK exists
The .asc moving code just needed to be indented so it only runs when
'srcname' exists in apk[], otherwise it just throws a KeyError
2014-06-30 23:01:48 -04:00
Hans-Christoph Steiner
a58a9bff18 run pre-commit hook as part of test suite 2014-06-30 23:01:48 -04:00
Hans-Christoph Steiner
4d913d646a replace redundant build_tools check that breaks fdroid init
This reverts b637568a62 since it added a
redundant check that broke `fdroid init` when the default version dir of
build_tools does not exist on the local system.  It then uses the function
that was already in place for checking the build_tools setup in a way that
does not break `fdroid init`.

Now that the fake android home version is not matching the default version,
the tests will catch this bug in the future.
2014-06-30 23:01:47 -04:00
Hans-Christoph Steiner
9dd138b253 fix bad syncing from local copy, force trailing slash to make rsync happy
It seems that paths for rsync must have a trailing slash in order to sync
rather than make a subdir, i.e. this makes a duplicate subdir:

  rsync /tmp/fdroid/repo repo

While this syncs the dirs

  rsync /tmp/fdroid/repo/ repo/
2014-06-30 23:01:47 -04:00
Hans-Christoph Steiner
3dbe503071 check repo icons exist now before running through all of fdroid update
Before, if repo_icon or archive_icon pointed to a non-existent file, then
`fdroid update` would run through the whole process of building a repo,
then fail at the very end because of the non-existent file.  On the next
run, `fdroid update` then starts from the beginning.

This just checks for those files at the beginning, and exits with an error
if they are not found.
2014-06-30 23:01:47 -04:00
Hans-Christoph Steiner
7a3992aa1a use 'python2' everywhere since fdroidserver has not been tested with 3.x 2014-06-30 23:01:47 -04:00
Hans-Christoph Steiner
40d4e30010 tests: create_fake_android_home should create old build-tools version
This is testing the build-tools version auto-detect in `fdroid init`, so it
should be kept as an older version.  This is not meant to test the current
version of the build tools.
2014-06-30 21:19:55 -04:00
Hans-Christoph Steiner
afb98f9327 fix PEP8 fdroidserver/common.py:65:13: E126 continuation line over-indented for hanging indent 2014-06-30 21:19:55 -04:00
Ciaran Gultnieks
1a11982897 Move gpg signatures to archive along with the other files 2014-06-30 22:53:02 +01:00
Ciaran Gultnieks
693cb7ce70 Generate gpg signatures for apks in archive repo also 2014-06-30 22:49:54 +01:00
Ciaran Gultnieks
b1192f7b66 Fix indent 2014-06-30 21:32:43 +01:00
Daniel Martí
34151241f4 Don't change the behaviour in debian setups 2014-06-30 19:52:59 +02:00
Daniel Martí
cef7cd2888 Support calling of 'fdroid init' from other places
e.g. from a symlink to fdroid or from a script. Also more reliable in other
cases where argv[0] is not what we want.
2014-06-30 19:38:38 +02:00
Daniel Martí
348c6a1085 Update the SDK to version 23.0.0 2014-06-30 17:03:26 +02:00
Daniel Martí
cbdcdd1e78 Update build-tools to 20.0.0 2014-06-30 17:03:16 +02:00
Daniel Martí
fdb53b75f4 Report the vercode as well as the version name when building 2014-06-30 16:34:26 +02:00
Daniel Martí
4d63ed0568 Add optipng, useful for some apps
Specifically, for cz.jirkovsky.lukas.chmupocasi
2014-06-30 16:22:31 +02:00
Daniel Martí
c750b02a6c Always run aapt with SilentPopen 2014-06-30 16:15:14 +02:00
Daniel Martí
49208b257d Always run read_srclibs as part of read_metadata 2014-06-30 14:39:52 +02:00
Ciaran Gultnieks
dc8eb49b31 Recognise published .asc signatures in web repo browser 2014-06-30 12:04:22 +01:00
Ciaran Gultnieks
07006e4c00 Generate gpg signatures with .asc extension 2014-06-30 12:04:04 +01:00
Ciaran Gultnieks
3cb4a80efb Fix stats update bug 2014-06-30 12:03:45 +01:00
Daniel Martí
2bab6b83c1 Fix the copyright notice in gpgsign.py 2014-06-30 00:08:10 +02:00
Daniel Martí
4ba9da0906 git-svn: use 'origin/' when passing a treeish (branches) to find-rev
This fixes the builds of de.blau.android. This worked before for some reason.
Git-svn probably changed in some way.
2014-06-29 01:29:31 +02:00
Daniel Martí
6dd19063e9 Merge branch 'fix-and-test-source-tarball-process' of https://gitlab.com/eighthave/fdroidserver 2014-06-28 19:57:45 +02:00
Daniel Martí
a831d484e6 Place more examples/config.py stuff into the defaults 2014-06-28 19:57:14 +02:00
Hans-Christoph Steiner
25a94dced2 tests: create a source tarball and use that to build a repo
This tests that setup.py is in working order and creating a functional
source tarball.
2014-06-27 20:31:28 -04:00
Hans-Christoph Steiner
0e47d62024 tests: by default, run on included urzip.apk
This means you can just do `cd tests/ && ./run-tests` to run the tests now.
You can still override the APK source with the first argument, like:

cd tests/ && ./run-tests /path/to/lots/of/apks/dir
2014-06-27 20:31:28 -04:00
Daniel Martí
df6d511a8e Merge branch 'add-local_copy_dir-and-v0.2-fixes' of https://gitlab.com/eighthave/fdroidserver 2014-06-27 21:11:52 +02:00
Hans-Christoph Steiner
22473e2052 set version to v0.2 2014-06-26 20:47:36 -04:00
Hans-Christoph Steiner
9b30e2665d include getsig.java and opensc-fdroid.cfg in the source tarball 2014-06-26 20:47:36 -04:00
Hans-Christoph Steiner
0466d4aa4f server update: mkdir 'archive' if it does not exist
If `fdroid server update` is run with config that includes an archive, but
the 'archive' subdir does not exist, create it.  This mirrors the code that
is in `fdroid update`.  Seems to trivial to move to common.py.
2014-06-26 20:47:36 -04:00
Hans-Christoph Steiner
25f6b0c246 server: --sync-from-local-copy-dir for updating from offline signing repo
To support a fully offline build/signing machine, there is the "local copy
dir".  The repo is generated on the offline machine and then copied to a
local dir where a thumb drive or SD Card is mounted.  Then on the online
machine, using `fdroid server update --sync-from-local-copy-dir` allows
the whole server update process to happen in a single command:

0. read config.py on online machine's repo
1. rsync from the local_copy_dir to the current dir
2. copy to serverwebroot, awsbucket, etc.
2014-06-26 20:47:36 -04:00
Hans-Christoph Steiner
fd24416f4e switch serverwebroot rsync to --archive for guaranteed full sync
In `fdroid server update`, the rsync command used --update, which
`man rsync` says: "skip files that are newer on the receiver".  That could
cause issues of the public repo getting out of sync with the private,
master repo.  --archive is a better sync method since it aims to exactly
reproduce the sending dir to the receiving dir.
2014-06-26 20:47:36 -04:00
Hans-Christoph Steiner
d73b43c5fc server: 'local_copy_dir' config/options to automate offline repo signing
This allows a dir to be specified in config.py that `fdroid server update`
will automatically rsync the repo to.  The idea is that the path would
point to an SD card on a fully offline machine that serves as the secure
repo signing machine.
2014-06-26 20:47:36 -04:00
Daniel Martí
0ee6fc8c22 Raise gotorevision exceptions with more useful info 2014-06-26 13:07:49 +02:00
Daniel Martí
e49b7aafda Always try to recover origin/HEAD in case it's not there 2014-06-26 13:03:51 +02:00
Daniel Martí
4ad7e8be06 Easier multiline strings 2014-06-26 12:52:16 +02:00
Daniel Martí
4e153cc60d Error if UCM:Tags is used with git-svn without tags set up 2014-06-26 12:41:50 +02:00
Daniel Martí
33ed7f077d Simplify check_metadata 2014-06-26 12:39:42 +02:00
Ciaran Gultnieks
9a70575feb Fix pep8 error in previous commit 2014-06-25 12:38:25 +01:00
Ciaran Gultnieks
95d8f29479 Fix nasty problem caused by 7c2e61a4 2014-06-25 11:43:44 +01:00
Daniel Martí
c0f026c9c4 Use origin/HEAD as the default checkout for git
This should fix many RepoManifest UCMs where 'master' is not the default
branch
2014-06-25 11:13:28 +02:00
Ciaran Gultnieks
c9638cf7dd Be more specific when logging repository deletes 2014-06-25 09:54:14 +01:00
Ciaran Gultnieks
9df3a491de Fix popen command logging 2014-06-25 09:25:55 +01:00
Daniel Martí
2c8df2c1ef Small buildjni= fixes 2014-06-24 22:31:39 +02:00
Daniel Martí
53aba5365f Don't error about native code if buildjni=no 2014-06-24 22:21:04 +02:00
Daniel Martí
26154127e6 Only report files that were actually cleaned of signing stuff 2014-06-22 21:34:14 +02:00
Daniel Martí
7c2e61a407 Set the FDroidOpen output default back to true
Having it at False just makes SilentPopen useless.
2014-06-22 21:29:07 +02:00
Daniel Martí
14f865a5b1 Don't use logging.info with verbose ifs 2014-06-22 21:28:33 +02:00