chiark / gitweb /
fdroidserver.git
9 years agoBump version to 0.2.1 0.2.1
Daniel Martí [Sat, 2 Aug 2014 11:44:48 +0000 (13:44 +0200)]
Bump version to 0.2.1

9 years agoAdd python-gnupg to buildserver
Ciaran Gultnieks [Thu, 31 Jul 2014 17:49:34 +0000 (18:49 +0100)]
Add python-gnupg to buildserver

9 years agoRemove extra argument in magic warning call
Daniel Martí [Thu, 24 Jul 2014 06:55:54 +0000 (08:55 +0200)]
Remove extra argument in magic warning call

9 years agostats: don't include disabled apps
Daniel Martí [Wed, 23 Jul 2014 17:55:45 +0000 (19:55 +0200)]
stats: don't include disabled apps

9 years agoUse --before when using find-rev in git-svn
Daniel Martí [Wed, 23 Jul 2014 15:26:33 +0000 (17:26 +0200)]
Use --before when using find-rev in git-svn

9 years agoDon't crash if a magic number can't be used
Daniel Martí [Tue, 22 Jul 2014 08:06:38 +0000 (10:06 +0200)]
Don't crash if a magic number can't be used

This should fix the anki build crashing.

9 years agoMerge branch 'master' of https://gitlab.com/eighthave/fdroidserver
Daniel Martí [Fri, 18 Jul 2014 11:21:40 +0000 (13:21 +0200)]
Merge branch 'master' of https://gitlab.com/eighthave/fdroidserver

9 years agoDrop svn support in favour of git-svn
Daniel Martí [Fri, 18 Jul 2014 10:39:24 +0000 (12:39 +0200)]
Drop svn support in favour of git-svn

Reasons:

* Cloning a svn repo via svn doesn't fetch the entire history
* Svn checkout is incredibly slow
* Svn doesn't have important features such as a 'clean' command

The only reason why we kept svn was for anonymous logins to repositories. This
is no longer a reason since git-svn also supports them.

9 years agoUse os.path.join instead of adding strings more often
Daniel Martí [Fri, 18 Jul 2014 10:21:52 +0000 (12:21 +0200)]
Use os.path.join instead of adding strings more often

9 years agoFix Tags UCM on newer git-svn versions
Daniel Martí [Fri, 18 Jul 2014 10:12:16 +0000 (12:12 +0200)]
Fix Tags UCM on newer git-svn versions

9 years agodefault to Pillow for Python Imaging, that's what most people use now
Hans-Christoph Steiner [Thu, 17 Jul 2014 16:31:57 +0000 (12:31 -0400)]
default to Pillow for Python Imaging, that's what most people use now

PIL is the old standard Python Imaging.  Pillow is a fork where development
is actually continuing.  It seems that all the distros are also switching
from PIL to Pillow, including Debian, Ubuntu, Fedora, brew, MacPorts, etc.

9 years agoPut lastbuild log on wiki by vercode (with redirect)
Ciaran Gultnieks [Thu, 17 Jul 2014 13:05:16 +0000 (14:05 +0100)]
Put lastbuild log on wiki by vercode (with redirect)

9 years agoMerge branch 'support-multiple-serverwebroots-and-fixes' into 'master'
Ciaran Gultnieks [Wed, 16 Jul 2014 21:07:10 +0000 (21:07 +0000)]
Merge branch 'support-multiple-serverwebroots-and-fixes' into 'master'

Support multiple serverwebroots and fixes

This adds support for lists of serverwebroots in config.py, and cleans newlines and spaces in the repo_description and archive_description.

9 years agoMake FlattrID a hexadecimal value
Daniel Martí [Tue, 15 Jul 2014 22:02:01 +0000 (00:02 +0200)]
Make FlattrID a hexadecimal value

This adds support for flattr "things" that are not direct flattr numeric ids,
but hexadecimal hashes representing web pages outside of flattr.

9 years agosupport lists/tuples in 'serverwebroot' config item
Hans-Christoph Steiner [Mon, 14 Jul 2014 19:03:58 +0000 (15:03 -0400)]
support lists/tuples in 'serverwebroot' config item

This allows the user to specify multiple servers to put the repo to, and
`fdroid server update` will automatically push to them all.

fixes #22 https://gitlab.com/fdroid/fdroidserver/issues/22

9 years agoupdate local_copy_dir rsync to handle FAT and filesystems with perms
Hans-Christoph Steiner [Thu, 3 Jul 2014 01:03:26 +0000 (21:03 -0400)]
update local_copy_dir rsync to handle FAT and filesystems with perms

With FAT filesystems, the user, group, and permissions will not be at all
preserved.  With file systems like ext4 that have perms, the umask might
not be set to something that makes sense for the public repo files, which
are meant to be published and therefore readible by all.

If need be, it would be easy enough to add a config option for rsync's
chmod string, to address setups that have specific permissions needs.

fixes #23 https://gitlab.com/fdroid/fdroidserver/issues/23

9 years agoauto-clean newlines and spaces in repo/archive descriptions
Hans-Christoph Steiner [Thu, 3 Jul 2014 00:57:47 +0000 (20:57 -0400)]
auto-clean newlines and spaces in repo/archive descriptions

This gives us flexibility in how the blocks of text can be formatted in
config.py, but also provides a more useful format for displaying since the
client can decide where to wrap the text.

9 years agoserver init: replace ssh subprocess with paramiko
Hans-Christoph Steiner [Thu, 3 Jul 2014 00:54:52 +0000 (20:54 -0400)]
server init: replace ssh subprocess with paramiko

It is easier to handle programming with python rather than subprocess calls
so I replaced the subprocess call to 'ssh' with paramiko.  This also makes
fdroid more portable since it no longer relies on the local system having
ssh installed.

9 years agoDon't use the error-prone -x method to avoid lint usage
Daniel Martí [Thu, 10 Jul 2014 10:07:10 +0000 (12:07 +0200)]
Don't use the error-prone -x method to avoid lint usage

9 years agoUse p.wait() instead of p.communicate()
Daniel Martí [Wed, 9 Jul 2014 17:22:39 +0000 (19:22 +0200)]
Use p.wait() instead of p.communicate()

The latter calls the former anyway, and we don't need to fetch the output nor
send any stdin.

9 years agoMake a few Popens silent
Daniel Martí [Wed, 9 Jul 2014 17:15:39 +0000 (19:15 +0200)]
Make a few Popens silent

9 years agoMuch cleaner and nicer way to ignore vcs dot dirs
Daniel Martí [Wed, 9 Jul 2014 17:11:13 +0000 (19:11 +0200)]
Much cleaner and nicer way to ignore vcs dot dirs

We now discard their entire subtree directly

9 years agoMore generic usual suspects regex
Daniel Martí [Wed, 9 Jul 2014 16:17:28 +0000 (18:17 +0200)]
More generic usual suspects regex

9 years agoOnly catch metadata exceptions from description_html
Daniel Martí [Wed, 9 Jul 2014 14:48:28 +0000 (16:48 +0200)]
Only catch metadata exceptions from description_html

9 years agoRevert "If given --verbose, don't print the whole error log again"
Daniel Martí [Wed, 9 Jul 2014 09:14:01 +0000 (11:14 +0200)]
Revert "If given --verbose, don't print the whole error log again"

This reverts commit 29ab3cf64df2eebdaae44b643a26c118b58c0c7e.

9 years agoRevert "Always print command output when --verbose"
Daniel Martí [Wed, 9 Jul 2014 09:11:41 +0000 (11:11 +0200)]
Revert "Always print command output when --verbose"

This reverts commit a4cdd92448450839c307b4a04f85a3702bfa4d9c.

9 years agoRemove some gradle @dir leftovers
Daniel Martí [Wed, 9 Jul 2014 09:11:13 +0000 (11:11 +0200)]
Remove some gradle @dir leftovers

9 years agoSimplify the finding of gradle output apks
Daniel Martí [Wed, 9 Jul 2014 09:08:11 +0000 (11:08 +0200)]
Simplify the finding of gradle output apks

9 years agoSupport git-svn refs in the form of rN
Daniel Martí [Wed, 9 Jul 2014 08:41:35 +0000 (10:41 +0200)]
Support git-svn refs in the form of rN

9 years agoDo write .fdroidvcs if the clone succeeded
Daniel Martí [Wed, 9 Jul 2014 08:30:28 +0000 (10:30 +0200)]
Do write .fdroidvcs if the clone succeeded

If the clone succeeded but the checkout failed, it didn't. Now it does, by
keeping the exception and raising it a bit later.

9 years agoSupport origin/ checkouts with tags as well in gitsvn
Daniel Martí [Tue, 8 Jul 2014 10:04:24 +0000 (12:04 +0200)]
Support origin/ checkouts with tags as well in gitsvn

9 years agoAlways print command output when --verbose
Daniel Martí [Tue, 8 Jul 2014 09:16:03 +0000 (11:16 +0200)]
Always print command output when --verbose

9 years agoDon't use generic Exception raises
Daniel Martí [Mon, 7 Jul 2014 13:41:32 +0000 (15:41 +0200)]
Don't use generic Exception raises

That hides bugs, since all exceptions (including bugs that cause raises that
weren't our doing) fall under the "Exception" except

9 years agoFix silly var name typo
Daniel Martí [Sun, 6 Jul 2014 21:28:25 +0000 (23:28 +0200)]
Fix silly var name typo

9 years agoStop at the summary when parsing a file for the app name
Daniel Martí [Sun, 6 Jul 2014 09:38:32 +0000 (11:38 +0200)]
Stop at the summary when parsing a file for the app name

9 years agoUse 'case' instead of if/elif in the line matching logic
Daniel Martí [Sun, 6 Jul 2014 09:37:52 +0000 (11:37 +0200)]
Use 'case' instead of if/elif in the line matching logic

9 years agoRevert "Rewrite fd-commit in POSIX Shell"
Daniel Martí [Sun, 6 Jul 2014 09:29:31 +0000 (11:29 +0200)]
Revert "Rewrite fd-commit in POSIX Shell"

This reverts commit 62ba9dc07e989ce75b6bd9f971bbb1cec04c4da0.

9 years agoMore log level fixes
Daniel Martí [Sat, 5 Jul 2014 13:29:12 +0000 (15:29 +0200)]
More log level fixes

9 years agoMove more logging.info stuff to debug
Daniel Martí [Sat, 5 Jul 2014 13:25:39 +0000 (15:25 +0200)]
Move more logging.info stuff to debug

9 years agoUse logging with proper format when warning about improper verbose/quiet usage
Daniel Martí [Sat, 5 Jul 2014 12:17:02 +0000 (14:17 +0200)]
Use logging with proper format when warning about improper verbose/quiet usage

9 years agoUsing $(levelname) in --quiet makes no sense
Daniel Martí [Sat, 5 Jul 2014 12:15:31 +0000 (14:15 +0200)]
Using $(levelname) in --quiet makes no sense

9 years agoAll logging goes to stderr, FDroidPopen should too
Daniel Martí [Sat, 5 Jul 2014 12:10:26 +0000 (14:10 +0200)]
All logging goes to stderr, FDroidPopen should too

9 years agoDon't directly print FDroidPopen output unless verbose
Daniel Martí [Sat, 5 Jul 2014 12:07:53 +0000 (14:07 +0200)]
Don't directly print FDroidPopen output unless verbose

9 years agoUse counters in lint
Daniel Martí [Sat, 5 Jul 2014 12:04:51 +0000 (14:04 +0200)]
Use counters in lint

9 years agoSimpler fd-commit arg logic
Daniel Martí [Sat, 5 Jul 2014 11:06:01 +0000 (13:06 +0200)]
Simpler fd-commit arg logic

9 years agoRewrite fd-commit in POSIX Shell
Daniel Martí [Sat, 5 Jul 2014 11:01:17 +0000 (13:01 +0200)]
Rewrite fd-commit in POSIX Shell

9 years agoTry the old git svn find-rev format as well
Daniel Martí [Sat, 5 Jul 2014 10:15:20 +0000 (12:15 +0200)]
Try the old git svn find-rev format as well

9 years agoLittle doc fixes
Daniel Martí [Sat, 5 Jul 2014 10:05:54 +0000 (12:05 +0200)]
Little doc fixes

9 years agocheckupdates: don't print traces independently
Daniel Martí [Fri, 4 Jul 2014 07:55:06 +0000 (09:55 +0200)]
checkupdates: don't print traces independently

9 years agoAvoid lint on all new plugin versions, remove TODO
Daniel Martí [Fri, 4 Jul 2014 06:59:30 +0000 (08:59 +0200)]
Avoid lint on all new plugin versions, remove TODO

9 years agoAdd support for gradle plugin version 0.12
Daniel Martí [Fri, 4 Jul 2014 06:50:20 +0000 (08:50 +0200)]
Add support for gradle plugin version 0.12

9 years agoFix the test suite
Daniel Martí [Thu, 3 Jul 2014 20:33:40 +0000 (22:33 +0200)]
Fix the test suite

9 years agoAdd android-20 to the SDK
Daniel Martí [Thu, 3 Jul 2014 20:30:30 +0000 (22:30 +0200)]
Add android-20 to the SDK

9 years agoAdd config.buildserver.py to the pre-commit hook
Daniel Martí [Thu, 3 Jul 2014 16:28:49 +0000 (18:28 +0200)]
Add config.buildserver.py to the pre-commit hook

9 years agoNo need to print a trace when the user did a ^C
Daniel Martí [Thu, 3 Jul 2014 16:26:49 +0000 (18:26 +0200)]
No need to print a trace when the user did a ^C

9 years agoAlso check that platform-tools and tools exist
Daniel Martí [Thu, 3 Jul 2014 16:23:35 +0000 (18:23 +0200)]
Also check that platform-tools and tools exist

9 years agoAlso use adb via a full path
Daniel Martí [Thu, 3 Jul 2014 16:21:33 +0000 (18:21 +0200)]
Also use adb via a full path

9 years agoUse shorter and non-redundant 'or' clauses for 'if True else' assignments
Daniel Martí [Thu, 3 Jul 2014 15:35:28 +0000 (17:35 +0200)]
Use shorter and non-redundant 'or' clauses for 'if True else' assignments

9 years agoRecognise changes in subdirs in Tags and RepoManifest
Daniel Martí [Thu, 3 Jul 2014 15:25:31 +0000 (17:25 +0200)]
Recognise changes in subdirs in Tags and RepoManifest

9 years agoUse any of the branches that point to origin/HEAD if there are multiple
Daniel Martí [Thu, 3 Jul 2014 14:25:24 +0000 (16:25 +0200)]
Use any of the branches that point to origin/HEAD if there are multiple

'set-head origin --auto' fails if there are multiple branches that are the
same as origin/HEAD:

error: Multiple remote HEAD branches. Please choose one explicitly with:
  git remote set-head origin develop
  git remote set-head origin master

So we want to grab any of them, e.g. the first branch that it gives us, and
just use that as it will work just fine.

9 years agoUpdate the SDK to 23.0.2, supposedly fixing all issues
Daniel Martí [Thu, 3 Jul 2014 13:36:43 +0000 (15:36 +0200)]
Update the SDK to 23.0.2, supposedly fixing all issues

9 years agoMake use of FDroidException in the main fdroid script
Daniel Martí [Thu, 3 Jul 2014 11:59:36 +0000 (13:59 +0200)]
Make use of FDroidException in the main fdroid script

This should improve the output shown when exceptions are found

9 years agovcs_* stuff should not raise BuildExceptions
Daniel Martí [Thu, 3 Jul 2014 11:53:54 +0000 (13:53 +0200)]
vcs_* stuff should not raise BuildExceptions

9 years agoAlso make the Tags UCM complain about unknown package id
Daniel Martí [Thu, 3 Jul 2014 11:44:27 +0000 (13:44 +0200)]
Also make the Tags UCM complain about unknown package id

9 years agoFix failure to do anything when ndk_path is not defined
Ciaran Gultnieks [Thu, 3 Jul 2014 07:56:48 +0000 (08:56 +0100)]
Fix failure to do anything when ndk_path is not defined

9 years agoSome more slight logging improvements
Daniel Martí [Wed, 2 Jul 2014 22:43:03 +0000 (00:43 +0200)]
Some more slight logging improvements

9 years agoRemove more prints in favour of logging
Daniel Martí [Wed, 2 Jul 2014 22:35:43 +0000 (00:35 +0200)]
Remove more prints in favour of logging

9 years agoFind the 'android' executable in the same manner
Daniel Martí [Wed, 2 Jul 2014 22:34:16 +0000 (00:34 +0200)]
Find the 'android' executable in the same manner

9 years agoAlso find zipalign at the start
Daniel Martí [Wed, 2 Jul 2014 22:31:10 +0000 (00:31 +0200)]
Also find zipalign at the start

9 years agoFind aapt as part of the main config initialisation
Daniel Martí [Wed, 2 Jul 2014 22:27:44 +0000 (00:27 +0200)]
Find aapt as part of the main config initialisation

9 years agoRefuse to try downloading a repo twice
Daniel Martí [Wed, 2 Jul 2014 15:21:45 +0000 (17:21 +0200)]
Refuse to try downloading a repo twice

9 years agoException handling improvements
Daniel Martí [Wed, 2 Jul 2014 13:30:05 +0000 (15:30 +0200)]
Exception handling improvements

* Replace some prints with proper logging messages
* Make VCSException as verbose as BuildException, including error output

9 years agoDon't set $SDK, it's too ambiguous with e.g. the Java SDK
Daniel Martí [Wed, 2 Jul 2014 13:01:08 +0000 (15:01 +0200)]
Don't set $SDK, it's too ambiguous with e.g. the Java SDK

9 years agoSet up SDK and NDK env vars from python
Daniel Martí [Tue, 1 Jul 2014 19:03:50 +0000 (21:03 +0200)]
Set up SDK and NDK env vars from python

No need to make the buildserver do it

9 years agoImprove some log levels
Daniel Martí [Tue, 1 Jul 2014 18:32:49 +0000 (20:32 +0200)]
Improve some log levels

9 years agoRemove @dir support from gradle
Daniel Martí [Tue, 1 Jul 2014 17:39:41 +0000 (19:39 +0200)]
Remove @dir support from gradle

9 years agoSimpler way to get the available gradle versions
Daniel Martí [Tue, 1 Jul 2014 17:18:12 +0000 (19:18 +0200)]
Simpler way to get the available gradle versions

Also, sort by version names instead of alphabetically

9 years agoFix the default config.py descriptions following the tuple syntax
Daniel Martí [Tue, 1 Jul 2014 16:22:05 +0000 (18:22 +0200)]
Fix the default config.py descriptions following the tuple syntax

9 years agoMerge branch 'bug-fixes-for-v0.2.1' of https://gitlab.com/eighthave/fdroidserver
Daniel Martí [Tue, 1 Jul 2014 16:13:00 +0000 (18:13 +0200)]
Merge branch 'bug-fixes-for-v0.2.1' of https://gitlab.com/eighthave/fdroidserver

9 years agoRename PopenResult.stdout to output since it also contains stderr
Daniel Martí [Tue, 1 Jul 2014 16:04:41 +0000 (18:04 +0200)]
Rename PopenResult.stdout to output since it also contains stderr

9 years agoFix very silly typo that broke all apps using buildjni
Daniel Martí [Tue, 1 Jul 2014 15:51:17 +0000 (17:51 +0200)]
Fix very silly typo that broke all apps using buildjni

9 years agoonly move GPG signature if APK exists
Hans-Christoph Steiner [Tue, 1 Jul 2014 01:47:47 +0000 (21:47 -0400)]
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

9 years agorun pre-commit hook as part of test suite
Hans-Christoph Steiner [Tue, 1 Jul 2014 01:40:31 +0000 (21:40 -0400)]
run pre-commit hook as part of test suite

9 years agoreplace redundant build_tools check that breaks `fdroid init`
Hans-Christoph Steiner [Tue, 1 Jul 2014 01:37:46 +0000 (21:37 -0400)]
replace redundant build_tools check that breaks `fdroid init`

This reverts b637568a624cc75f4e67a0df59a017872e2129c6 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.

9 years agofix bad syncing from local copy, force trailing slash to make rsync happy
Hans-Christoph Steiner [Mon, 30 Jun 2014 20:09:57 +0000 (16:09 -0400)]
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/

9 years agocheck repo icons exist now before running through all of `fdroid update`
Hans-Christoph Steiner [Mon, 30 Jun 2014 16:19:47 +0000 (12:19 -0400)]
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.

9 years agouse 'python2' everywhere since fdroidserver has not been tested with 3.x
Hans-Christoph Steiner [Mon, 30 Jun 2014 15:31:38 +0000 (11:31 -0400)]
use 'python2' everywhere since fdroidserver has not been tested with 3.x

9 years agotests: create_fake_android_home should create old build-tools version
Hans-Christoph Steiner [Mon, 30 Jun 2014 15:28:38 +0000 (11:28 -0400)]
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.

9 years agofix PEP8 fdroidserver/common.py:65:13: E126 continuation line over-indented for hangi...
Hans-Christoph Steiner [Mon, 30 Jun 2014 15:27:21 +0000 (11:27 -0400)]
fix PEP8 fdroidserver/common.py:65:13: E126 continuation line over-indented for hanging indent

9 years agoMove gpg signatures to archive along with the other files
Ciaran Gultnieks [Mon, 30 Jun 2014 21:53:02 +0000 (22:53 +0100)]
Move gpg signatures to archive along with the other files

9 years agoGenerate gpg signatures for apks in archive repo also
Ciaran Gultnieks [Mon, 30 Jun 2014 21:49:54 +0000 (22:49 +0100)]
Generate gpg signatures for apks in archive repo also

9 years agoFix indent
Ciaran Gultnieks [Mon, 30 Jun 2014 20:32:43 +0000 (21:32 +0100)]
Fix indent

9 years agoDon't change the behaviour in debian setups
Daniel Martí [Mon, 30 Jun 2014 17:52:59 +0000 (19:52 +0200)]
Don't change the behaviour in debian setups

9 years agoSupport calling of 'fdroid init' from other places
Daniel Martí [Mon, 30 Jun 2014 17:38:38 +0000 (19:38 +0200)]
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.

9 years agoUpdate the SDK to version 23.0.0
Daniel Martí [Mon, 30 Jun 2014 15:03:26 +0000 (17:03 +0200)]
Update the SDK to version 23.0.0

9 years agoUpdate build-tools to 20.0.0
Daniel Martí [Mon, 30 Jun 2014 15:03:16 +0000 (17:03 +0200)]
Update build-tools to 20.0.0

9 years agoReport the vercode as well as the version name when building
Daniel Martí [Mon, 30 Jun 2014 14:34:26 +0000 (16:34 +0200)]
Report the vercode as well as the version name when building

9 years agoAdd optipng, useful for some apps
Daniel Martí [Mon, 30 Jun 2014 14:22:31 +0000 (16:22 +0200)]
Add optipng, useful for some apps

Specifically, for cz.jirkovsky.lukas.chmupocasi

9 years agoAlways run aapt with SilentPopen
Daniel Martí [Mon, 30 Jun 2014 14:15:14 +0000 (16:15 +0200)]
Always run aapt with SilentPopen

9 years agoAlways run read_srclibs as part of read_metadata
Daniel Martí [Mon, 30 Jun 2014 12:39:52 +0000 (14:39 +0200)]
Always run read_srclibs as part of read_metadata