1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-08-15 19:00:11 +02:00
Commit Graph

2556 Commits

Author SHA1 Message Date
Hans-Christoph Steiner
0e00b36db5 fix PEP8 E124/E125/126/127/128 indentation issues
* E124 closing bracket does not match visual indentation
* E125 continuation line does not distinguish itself from next logical line
* E126 continuation line over-indented for hanging indent
* E127 continuation line over-indented for visual indent
* E128 continuation line under-indented for visual indent
2014-05-06 14:36:33 -04:00
Ciaran Gultnieks
ae3d1b036f Merge branch 'master' into 'master'
fix pyflakes error and a bunch of PEP8 fixes

lots of little fixes here, the first commit fixes the minor error that `pyflakes` raised, then the rest are all PEP8 fixes, as reported by the `pep8` command line tool.
2014-05-06 16:14:20 +00:00
Hans-Christoph Steiner
6abb390547 fix PEP8 "E261 at least two spaces before inline comment" 2014-05-06 11:45:04 -04:00
Hans-Christoph Steiner
aa5f317c26 fix PEP8 "W391 blank line at end of file" 2014-05-06 11:45:03 -04:00
Hans-Christoph Steiner
16dc3b27d6 fix PEP8 "E303 too many blank lines (2)" 2014-05-06 11:45:03 -04:00
Hans-Christoph Steiner
69989d4758 fix PEP8 "E302 expected 1 blank lines, found 0" 2014-05-06 11:45:03 -04:00
Hans-Christoph Steiner
3f4f7a544b fix PEP8 "E302 expected 2 blank lines, found 1" 2014-05-06 11:45:03 -04:00
Hans-Christoph Steiner
2f2618e06c fix PEP8 "E401 multiple imports on one line" 2014-05-06 11:45:03 -04:00
Hans-Christoph Steiner
fcca0ddb1f fix PEP8 "E712 comparison to True should be 'if cond is True:' or 'if cond:'" 2014-05-06 11:45:03 -04:00
Hans-Christoph Steiner
d8bae963a9 fix PEP8 "E703 statement ends with a semicolon" 2014-05-06 11:45:03 -04:00
Hans-Christoph Steiner
7e17fafc14 fix PEP8 "E225 missing whitespace around operator" 2014-05-06 11:45:03 -04:00
Hans-Christoph Steiner
c54cabe741 fix PEP8 "E228 missing whitespace around modulo operator" 2014-05-06 11:45:03 -04:00
Hans-Christoph Steiner
2d271806f1 fix PEP8 "E251 unexpected spaces around keyword / parameter equals" 2014-05-06 11:45:02 -04:00
Hans-Christoph Steiner
58a484e74e fix PEP8 "W291 trailing whitespace" 2014-05-06 11:45:02 -04:00
Hans-Christoph Steiner
62204d1fe5 fix PEP8 "E202 whitespace before ']' or '}'" 2014-05-06 11:45:02 -04:00
Hans-Christoph Steiner
4af2e0004f fix PEP8 "E201 whitespace after '(' or '[' or '{'" 2014-05-06 11:45:02 -04:00
Hans-Christoph Steiner
998011d535 fix PEP8 "E231 missing whitespace after ','" 2014-05-06 11:45:02 -04:00
Hans-Christoph Steiner
f1812d5935 fix PEP8 "E203 whitespace before ':' or ','" 2014-05-06 11:45:02 -04:00
Hans-Christoph Steiner
fccb990521 fix PEP8 "E711 comparison to None should be 'if cond is None:'" 2014-05-06 11:45:02 -04:00
Hans-Christoph Steiner
d564c37c35 fix "fdroidserver/build.py:41: redefinition of unused 'paramiko' from line 39"
pyflakes gave this error based on the `paramiko = None` statement. I used
a different way to test whether paramiko was successfully imported that is
directly based on the relevant Exceptions.
2014-05-06 11:45:02 -04:00
Daniel Martí
17b7f192b5 Add missing -q/--quiet completions 2014-05-06 16:19:05 +02:00
Daniel Martí
42bfe13be4 Also pre-compile list regex warnings 2014-05-06 16:08:53 +02:00
Daniel Martí
65205a6ec3 Warn about leading spaces in descriptions 2014-05-06 16:08:53 +02:00
Ciaran Gultnieks
225c644b3e Remove the other explicit vagrant references
Aside from the VM setup (which is now self-contained) the build process
only cares that it's handed a clean VM that it can access via ssh, given
a host/port/user/pubkey combination. There's no dependency outside the
getvm/releasevm functions on what kind of vm it is, what user the build
runs as, etc.
2014-05-01 23:33:17 +01:00
Ciaran Gultnieks
ee157b7c83 Remove some explicit references to the vagrant user 2014-05-01 23:24:54 +01:00
Ciaran Gultnieks
6db75545ef Separate the VM setup process from the build 2014-05-01 23:04:51 +01:00
Ciaran Gultnieks
d7cee19c02 Fix a few whitespace errors in build.py 2014-05-01 22:09:17 +01:00
Ciaran Gultnieks
2f6ce712f5 More PEP8 compliance (build.py, partial) 2014-04-30 23:23:57 +01:00
Ciaran Gultnieks
bd34fc2530 Remove the rest of the PEP8 errors from stats.py 2014-04-30 20:53:34 +01:00
Ciaran Gultnieks
5849b43e02 Remove strange semicolons 2014-04-30 11:46:28 +01:00
Ciaran Gultnieks
2a5c8a4aa2 Cache aggregate stats to save time 2014-04-29 15:33:34 +01:00
Daniel Martí
63ce679a9d Also remove 'disable' from auto-update builds 2014-04-29 16:06:24 +02:00
Daniel Martí
13af519069 Run git submodule sync before git submodule update
Fixes changes in submodule urls
2014-04-29 12:00:03 +02:00
Daniel Martí
965c767d8b Update 'fdroid build' args on bash-completion 2014-04-29 09:28:44 +02:00
Ciaran Gultnieks
73c73db0e9 Add extra options to import completion 2014-04-29 07:41:48 +01:00
Daniel Martí
bb4211b0be Revert "Don't auto update apps with the latest build disabled"
This reverts commit 32ae8bc565.
2014-04-29 00:00:40 +02:00
Daniel Martí
b2ef2b1b65 Small glob fix to fd-commit 2014-04-28 23:48:12 +02:00
Daniel Martí
83557583cb Add support for new files 2014-04-28 23:36:49 +02:00
Ciaran Gultnieks
a0dbddc6da Add config entry for optional gpg key 2014-04-28 21:32:32 +01:00
Daniel Martí
bfb549d101 Merge branch 'master' of https://gitlab.com/eighthave/fdroidserver 2014-04-27 14:26:03 +02:00
Daniel Martí
4592cece2f Slightly better summary/name warning message 2014-04-27 14:14:49 +02:00
Ciaran Gultnieks
fdd7123c55 Show detached gpg sigs for apks in repo browser 2014-04-27 09:30:26 +01:00
Hans-Christoph Steiner
5e93b6c80b update: report signing key fingerprint in same format as client
fdroidclient now uses SHA256 fingerprints internally, and they are shown in
the repo details view.  This changes the digest algorithm to SHA256 and
changes the format to match what is shown in the repo details view.
2014-04-25 21:07:47 -04:00
Hans-Christoph Steiner
a66bf2037c server: fix logging of file upload to awsbucket
Thanks to Adam Pritchard for reporting this
2014-04-23 20:10:02 -04:00
Hans-Christoph Steiner
21769e9f0a server: test using config.get() in case dict value is None
If a key 'foo' is set to None, `if config.get('foo'):` will be false while
`if 'foo' in config:` will be true.  A None value is not useful here, so
config.get() is the better check.

Thanks to Adam Pritchard for the suggestion.
2014-04-23 20:10:02 -04:00
Hans-Christoph Steiner
ef7c9d89d2 init: --no-prompt to skip sdk_path prompt
For running the tests and in other scripted setups, the user prompt is an
annoying. Using --no-prompt means the script can test for failure.
2014-04-23 20:10:02 -04:00
Hans-Christoph Steiner
66df02d5f8 init: --android-home for forcing the path to the Android SDK
This allows the user to set the path to their Android SDK from the command
line. This option is named after the standard env var ANDROID_HOME, as used
in the build.xml generated by `android update project`.  --android-home
takes precendence over the ANDROID_HOME env var if it is set.
2014-04-23 19:33:10 -04:00
Hans-Christoph Steiner
cc089b49b1 init: only overwrites config.py, so run even if repo/ exists
Previously, `fdroid init` would exit if a repo/ subdir existed.  Since it
only changes config.py, that test just caused confusion. Now, only exit if
config.py exists, and if repo/ does not exist, create it.
2014-04-23 19:33:01 -04:00
Hans-Christoph Steiner
186aec46ba init: split out defconfig and sdk test to run before config is loaded
`fdroid init` runs before any config.py exists, but it still needs to have
the default config and the SDK path tests.  So split those two bits out of
common.read_config() so that they can be run separately before config.py
is in place.
2014-04-23 19:32:04 -04:00
Ciaran Gultnieks
088b7dfa2a Merge branch 'master' into 'master'
support cloud storage, and assorted other improvements

I just finished support for `fdroid server update` to push to Amazon AWS S3 cloud store. It uses libcloud, so there could be lots of other cloud storage services added.  This would be used for alternative hosting locations for repos.  For example, for the Guardian Project repo, we'd include the URLs to various cloud storage options like https://s3.amazonaws.com/guardianproject/fdroid/repo
Services like https://s3.amazonaws.com/ are often not blocked when other things are.

It does not need to be Amazon-specific.  I went with libcloud because it supports like 10 cloud storage and is under active development.  What is there is just the start. I'm new to cloud stuff, so I just started based on a script that Adam Prichart of psiphon gave me. I had to do a fair amount of packaging work to get the python-libcloud Debian package updated. I almost have the 0.14.1 update done, I hope that'll be in Debian tonight.

Lots more info in the commit messages.
2014-04-23 07:31:56 +00:00