Ciaran Gultnieks
40945aded7
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.
2014-07-16 21:07:10 +00:00
Daniel Martí
18b105ac70
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.
2014-07-16 00:02:01 +02:00
Hans-Christoph Steiner
8c8fb8b156
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
2014-07-14 15:04:30 -04:00
Hans-Christoph Steiner
35ee4b1bc5
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
2014-07-14 15:02:20 -04:00
Hans-Christoph Steiner
f34c842f55
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.
2014-07-14 15:01:57 -04:00
Hans-Christoph Steiner
c7962e7c6d
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.
2014-07-14 15:01:57 -04:00
Daniel Martí
d69f93e5b2
Don't use the error-prone -x method to avoid lint usage
2014-07-10 12:07:10 +02:00
Daniel Martí
3d923a6718
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.
2014-07-09 19:22:39 +02:00
Daniel Martí
a834ff4ab2
Make a few Popens silent
2014-07-09 19:15:39 +02:00
Daniel Martí
69725c3f4c
Much cleaner and nicer way to ignore vcs dot dirs
...
We now discard their entire subtree directly
2014-07-09 19:11:13 +02:00
Daniel Martí
f3dd6d9510
More generic usual suspects regex
2014-07-09 18:17:28 +02:00
Daniel Martí
4ffa13167e
Only catch metadata exceptions from description_html
2014-07-09 16:48:28 +02:00
Daniel Martí
d5b06ec008
Revert "If given --verbose, don't print the whole error log again"
...
This reverts commit 29ab3cf64d
.
2014-07-09 11:14:01 +02:00
Daniel Martí
acbbc6a973
Revert "Always print command output when --verbose"
...
This reverts commit a4cdd92448
.
2014-07-09 11:11:41 +02:00
Daniel Martí
fad659921f
Remove some gradle @dir leftovers
2014-07-09 11:11:13 +02:00
Daniel Martí
7b8948f932
Simplify the finding of gradle output apks
2014-07-09 11:08:11 +02:00
Daniel Martí
b404e1b69c
Support git-svn refs in the form of rN
2014-07-09 10:41:35 +02:00
Daniel Martí
2c55fb499c
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.
2014-07-09 10:30:28 +02:00
Daniel Martí
f857169317
Support origin/ checkouts with tags as well in gitsvn
2014-07-08 12:04:24 +02:00
Daniel Martí
a4cdd92448
Always print command output when --verbose
2014-07-08 11:16:03 +02:00
Daniel Martí
ff06694adc
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
2014-07-07 15:41:50 +02:00
Daniel Martí
b56360512c
Fix silly var name typo
2014-07-06 23:28:25 +02:00
Daniel Martí
8f08487839
Stop at the summary when parsing a file for the app name
2014-07-06 11:38:32 +02:00
Daniel Martí
69bb03cd71
Use 'case' instead of if/elif in the line matching logic
2014-07-06 11:37:52 +02:00
Daniel Martí
1bcf7c7ce1
Revert "Rewrite fd-commit in POSIX Shell"
...
This reverts commit 62ba9dc07e
.
2014-07-06 11:29:31 +02:00
Daniel Martí
353e8dda00
More log level fixes
2014-07-05 15:29:12 +02:00
Daniel Martí
d8cd9a3163
Move more logging.info stuff to debug
2014-07-05 15:25:39 +02:00
Daniel Martí
4814238baf
Use logging with proper format when warning about improper verbose/quiet usage
2014-07-05 14:17:02 +02:00
Daniel Martí
5bf5ba04a6
Using $(levelname) in --quiet makes no sense
2014-07-05 14:15:31 +02:00
Daniel Martí
17dc21b69b
All logging goes to stderr, FDroidPopen should too
2014-07-05 14:10:26 +02:00
Daniel Martí
9d96ad3478
Don't directly print FDroidPopen output unless verbose
2014-07-05 14:07:53 +02:00
Daniel Martí
8249324a7b
Use counters in lint
2014-07-05 14:04:51 +02:00
Daniel Martí
905e58f54c
Simpler fd-commit arg logic
2014-07-05 13:06:01 +02:00
Daniel Martí
62ba9dc07e
Rewrite fd-commit in POSIX Shell
2014-07-05 13:01:17 +02:00
Daniel Martí
7d07e52e1f
Try the old git svn find-rev format as well
2014-07-05 12:15:20 +02:00
Daniel Martí
452c13907c
Little doc fixes
2014-07-05 12:05:54 +02:00
Daniel Martí
801f10c86f
checkupdates: don't print traces independently
2014-07-04 09:55:06 +02:00
Daniel Martí
faa35fb7c4
Avoid lint on all new plugin versions, remove TODO
2014-07-04 08:59:30 +02:00
Daniel Martí
8595e216f4
Add support for gradle plugin version 0.12
2014-07-04 08:50:20 +02:00
Daniel Martí
8b469a79f8
Fix the test suite
2014-07-03 22:33:40 +02:00
Daniel Martí
4e0e830038
Add android-20 to the SDK
2014-07-03 22:30:30 +02:00
Daniel Martí
b891689bc5
Add config.buildserver.py to the pre-commit hook
2014-07-03 18:28:49 +02:00
Daniel Martí
ec8291ba77
No need to print a trace when the user did a ^C
2014-07-03 18:26:49 +02:00
Daniel Martí
8306bac7de
Also check that platform-tools and tools exist
2014-07-03 18:23:35 +02:00
Daniel Martí
a8d4c8705f
Also use adb via a full path
2014-07-03 18:21:33 +02:00
Daniel Martí
3dbf99a7f2
Use shorter and non-redundant 'or' clauses for 'if True else' assignments
2014-07-03 17:35:28 +02:00
Daniel Martí
eaf3216e40
Recognise changes in subdirs in Tags and RepoManifest
2014-07-03 17:25:31 +02:00
Daniel Martí
00066a9b45
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.
2014-07-03 16:25:24 +02:00
Daniel Martí
ebfce778bc
Update the SDK to 23.0.2, supposedly fixing all issues
2014-07-03 15:36:43 +02:00
Daniel Martí
73142c740b
Make use of FDroidException in the main fdroid script
...
This should improve the output shown when exceptions are found
2014-07-03 14:01:22 +02:00