mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 22:42:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'handle-default-txt-in-fdroid-metadata' into 'master'

Browse source 
handle default.txt changelog in fdroid metadata/

See merge request fdroid/fdroidserver!1243
This commit is contained in:
Jochen Sprickerhof 2022-10-31 12:13:44 +00:00
commit eb79769b37
3 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
.gitlab-ci.yml
View file

@ -1,3 +1,4 @@
---
variables: variables:
pip: pip3 --timeout 100 --retries 10 pip: pip3 --timeout 100 --retries 10
@ -136,16 +137,14 @@ ubuntu_jammy_pip:
<<: *apt-template <<: *apt-template
script: script:
- apt-get install git default-jdk-headless python3-pip python3-venv rsync - apt-get install git default-jdk-headless python3-pip python3-venv rsync
- rm -rf env
- python3 -m venv env
- . env/bin/activate
- $pip install --upgrade babel pip setuptools
# setup venv to act as release build machine # setup venv to act as release build machine
- python -m venv sdist-env - python3 -m venv sdist-env
- . sdist-env/bin/activate - . sdist-env/bin/activate
- ./setup.py sdist - ./setup.py sdist
- deactivate - deactivate
- tar tzf dist/fdroidserver-*.tar.gz - tar tzf dist/fdroidserver-*.tar.gz
# back to bare machine to act as user's install machine # back to bare machine to act as user's install machine
- export ANDROID_HOME=/opt/android-sdk - export ANDROID_HOME=/opt/android-sdk
- $pip install sdkmanager - $pip install sdkmanager

5
.yamllint Normal file
View file

@ -0,0 +1,5 @@
---
extends: default
rules:
line-length: disable

1
fdroidserver/update.py
View file

@ -998,6 +998,7 @@ def insert_localized_app_metadata(apps):
os.path.join(root, f)) os.path.join(root, f))
elif f == 'default.txt': elif f == 'default.txt':
# use "default.txt" changelog entry as fallback. # use "default.txt" changelog entry as fallback.
locale = segments[-2]
localized = _get_localized_dict(apps[packageName], locale) localized = _get_localized_dict(apps[packageName], locale)
if not localized.get('whatsNew', ''): if not localized.get('whatsNew', ''):
_set_localized_text_entry(apps[packageName], locale, 'whatsNew', _set_localized_text_entry(apps[packageName], locale, 'whatsNew',