kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-04 22:40:12 +01:00
Code Activity

Merge branch 'master' into 'master'

Browse Source 
final 0.4.0 fixes

Because `setup.py` is broken because `MANIFEST.in` is still pointing to `README` and not `README.md`, the 0.4.0 tag needs to be deleted.  This merge requests fixes that and two other minor issues.  This has passed multiple runs of the test suite, both on my machine and the jenkins box.

See merge request !61
This commit is contained in:
Daniel Martí 2015-08-05 16:38:27 +00:00
commit c8806a3235
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MANIFEST.in
View File

@ -1,4 +1,4 @@
include README include README.md
include COPYING include COPYING
include fd-commit include fd-commit
include fdroid include fdroid

2
docs/fdroid.texi
View File

@ -456,7 +456,7 @@ following them). In fact, you can standardise all the metadata in a single
command, without changing the functional content, by running: command, without changing the functional content, by running:
@example @example
fdroid rewritemetadata fdroid rewritemeta
@end example @end example
The following sections describe the fields recognised within the file. The following sections describe the fields recognised within the file.

10
tests/run-tests
View File

@ -316,7 +316,7 @@ if [ $? -eq 0 ]; then
echo "This should have failed because this repo has no keystore!" echo "This should have failed because this repo has no keystore!"
exit 1 exit 1
else else
echo "`fdroid update` prompted to add keystore" echo '`fdroid update` prompted to add keystore'
fi fi
set -e set -e
$fdroid update --create-key $fdroid update --create-key
@ -378,7 +378,7 @@ if [ $? -eq 0 ]; then
echo "This should have failed because this repo has no keystore!" echo "This should have failed because this repo has no keystore!"
exit 1 exit 1
else else
echo "`fdroid update` prompted to add keystore" echo '`fdroid update` prompted to add keystore'
fi fi
set -e set -e
@ -394,7 +394,7 @@ if [ $? -eq 0 ]; then
echo "This should have failed because this repo has a bad/fake keystore!" echo "This should have failed because this repo has a bad/fake keystore!"
exit 1 exit 1
else else
echo "`fdroid update` prompted to add keystore" echo '`fdroid update` prompted to add keystore'
fi fi
set -e set -e
@ -422,7 +422,7 @@ if [ $? -eq 0 ]; then
echo "This should have failed because this repo has a bad repo_keyalias!" echo "This should have failed because this repo has a bad repo_keyalias!"
exit 1 exit 1
else else
echo "`fdroid update` prompted to add keystore" echo '`fdroid update` prompted to add keystore'
fi fi
set -e set -e
@ -434,7 +434,7 @@ if [ $? -eq 0 ]; then
echo "This should have failed because a keystore is already there!" echo "This should have failed because a keystore is already there!"
exit 1 exit 1
else else
echo "`fdroid update` complained about existing keystore" echo '`fdroid update` complained about existing keystore'
fi fi
set -e set -e