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 '343-ruamel-yaml-version-check' into 'master'

Browse Source 
check version of ruamel.yaml and raise according error message

See merge request !301
This commit is contained in:
Hans-Christoph Steiner 2017-07-06 08:10:14 +00:00
commit b34d5c83b9
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fdroidserver/metadata.py
View File

@ -35,7 +35,7 @@ except ImportError:
YamlLoader = Loader YamlLoader = Loader
import fdroidserver.common import fdroidserver.common
from fdroidserver.exception import MetaDataException from fdroidserver.exception import MetaDataException, FDroidException
srclibs = None srclibs = None
warnings_action = None warnings_action = None
@ -989,7 +989,20 @@ def parse_yaml_metadata(mf, app):
def write_yaml(mf, app): def write_yaml(mf, app):
import ruamel.yaml # import rumael.yaml and check version
try:
import ruamel.yaml
except ImportError as e:
raise FDroidException('ruamel.yaml not instlled, can not write metadata.') from e
if not ruamel.yaml.__version__:
raise FDroidException('ruamel.yaml.__version__ not accessible. Please make sure a ruamel.yaml >= 0.13 is installed..')
m = re.match('(?P<major>[0-9]+)\.(?P<minor>[0-9]+)\.(?P<patch>[0-9]+)(-.+)?',
ruamel.yaml.__version__)
if not m:
raise FDroidException('ruamel.yaml version malfored, please install an upstream version of ruamel.yaml')
if int(m.group('major')) < 0 or int(m.group('minor')) < 13:
raise FDroidException('currently installed version of ruamel.yaml ({}) is too old, >= 1.13 required.'.format(ruamel.yaml.__version__))
# suiteable version ruamel.yaml imported successfully
_yaml_bools_true = ('y', 'Y', 'yes', 'Yes', 'YES', _yaml_bools_true = ('y', 'Y', 'yes', 'Yes', 'YES',
'true', 'True', 'TRUE', 'true', 'True', 'TRUE',
@ -1480,11 +1493,16 @@ def write_metadata(metadatapath, app):
warn_or_exception('Cannot write "%s", not an accepted format, use: %s' warn_or_exception('Cannot write "%s", not an accepted format, use: %s'
% (metadatapath, ', '.join(accepted))) % (metadatapath, ', '.join(accepted)))
with open(metadatapath, 'w', encoding='utf8') as mf: try:
if ext == 'txt': with open(metadatapath, 'w', encoding='utf8') as mf:
return write_txt(mf, app) if ext == 'txt':
elif ext == 'yml': return write_txt(mf, app)
return write_yaml(mf, app) elif ext == 'yml':
return write_yaml(mf, app)
except FDroidException as e:
os.remove(metadatapath)
raise e
warn_or_exception('Unknown metadata format: %s' % metadatapath) warn_or_exception('Unknown metadata format: %s' % metadatapath)