Commit 019ec6d4 authored by Michael Pöhn's avatar Michael Pöhn
Browse files

Merge branch 'fix-appid-checks' into 'master'

fix Application ID checks

See merge request !582
parents ecb6987c d2216b75
Pipeline #31132427 passed with stage
in 17 minutes and 24 seconds
......@@ -77,7 +77,7 @@ APK_NAME_REGEX = re.compile(r'^([a-zA-Z][\w.]*)_(-?[0-9]+)_?([0-9a-f]{7})?\.apk'
APK_ID_TRIPLET_REGEX = re.compile(r"^package: name='(\w[^']*)' versionCode='([^']+)' versionName='([^']*)'")
STANDARD_FILE_NAME_REGEX = re.compile(r'^(\w[\w.]*)_(-?[0-9]+)\.\w+')
FDROID_PACKAGE_NAME_REGEX = re.compile(r'''^[a-f0-9]+$''', re.IGNORECASE)
STRICT_APPLICATION_ID_REGEX = re.compile(r'''(?:^[a-z_]+(?:\d*[a-zA-Z_]*)*)(?:\.[a-z_]+(?:\d*[a-zA-Z_]*)*)*$''')
STRICT_APPLICATION_ID_REGEX = re.compile(r'''(?:^[a-zA-Z]+(?:\d*[a-zA-Z_]*)*)(?:\.[a-zA-Z]+(?:\d*[a-zA-Z_]*)*)+$''')
VALID_APPLICATION_ID_REGEX = re.compile(r'''(?:^[a-z_]+(?:\d*[a-zA-Z_]*)*)(?:\.[a-z_]+(?:\d*[a-zA-Z_]*)*)*$''',
re.IGNORECASE)
......@@ -3268,7 +3268,7 @@ def deploy_build_log_with_rsync(appid, vercode, log_content,
if retcode:
logging.warning(_("failed deploying build logs to '{path}'").format(path=webroot))
else:
logging.info(_("deployeded build logs to '{path}'").format(path=webroot))
logging.info(_("deployed build logs to '{path}'").format(path=webroot))
def get_per_app_repos():
......
......@@ -99,7 +99,7 @@ def main():
parser.add_argument("--no-deploy", action="store_true", default=False,
help=_("Do not deploy the new files to the repo"))
parser.add_argument("--file", default='app/build/outputs/apk/*.apk',
help=_('The the file to be included in the repo (path or glob)'))
help=_('The file to be included in the repo (path or glob)'))
parser.add_argument("--no-checksum", action="store_true", default=False,
help=_("Don't use rsync checksums"))
# TODO add --with-btlog
......
......@@ -1071,7 +1071,7 @@ def scan_apk(apk_file):
raise BuildException(_("{appid} from {path} is not a valid Java Package Name!")
.format(appid=apk['packageName'], path=apk_file))
elif not common.is_strict_application_id(apk['packageName']):
logging.warning(_("{appid} from {path} is not a valid Java Package Name!")
logging.warning(_("{appid} from {path} is not a valid Android Package Name!")
.format(appid=apk['packageName'], path=apk_file))
# Get the signature, or rather the signing key fingerprints
......
......@@ -1483,7 +1483,7 @@ msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
msgstr "dir གྱི་རྩ་བ་ for local_copy_dir \"{path}\" མིན་འདུག!"
#: ../fdroidserver/nightly.py
msgid "The the file to be included in the repo (path or glob)"
msgid "The file to be included in the repo (path or glob)"
msgstr "(path or glob)རེ་པོ་ནང་ཚུད་པའི་ཡིག་ཆ།"
#: ../fdroidserver/publish.py
......
......@@ -1530,7 +1530,7 @@ msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
msgstr "Das Wurzelverzeichnis für local_copy_dir \"{path}\" existiert nicht!"
#: ../fdroidserver/nightly.py
msgid "The the file to be included in the repo (path or glob)"
msgid "The file to be included in the repo (path or glob)"
msgstr "Die in das Repo aufzunehmende Datei (Pfad oder Glob)"
#: ../fdroidserver/publish.py
......
......@@ -1501,7 +1501,7 @@ msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
msgstr ""
#: ../fdroidserver/nightly.py
msgid "The the file to be included in the repo (path or glob)"
msgid "The file to be included in the repo (path or glob)"
msgstr ""
#: ../fdroidserver/publish.py
......
......@@ -1425,7 +1425,7 @@ msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
msgstr ""
#: ../fdroidserver/nightly.py
msgid "The the file to be included in the repo (path or glob)"
msgid "The file to be included in the repo (path or glob)"
msgstr ""
#: ../fdroidserver/publish.py
......
......@@ -1435,7 +1435,7 @@ msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
msgstr ""
#: ../fdroidserver/nightly.py
msgid "The the file to be included in the repo (path or glob)"
msgid "The file to be included in the repo (path or glob)"
msgstr ""
#: ../fdroidserver/publish.py
......
......@@ -1424,7 +1424,7 @@ msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
msgstr ""
#: ../fdroidserver/nightly.py
msgid "The the file to be included in the repo (path or glob)"
msgid "The file to be included in the repo (path or glob)"
msgstr ""
#: ../fdroidserver/publish.py
......@@ -1771,7 +1771,7 @@ msgstr ""
#: ../fdroidserver/common.py
#, python-brace-format
msgid "deployeded build logs to '{path}'"
msgid "deployed build logs to '{path}'"
msgstr ""
#: /usr/lib/python3.5/argparse.py /usr/lib/python3.6/argparse.py
......
......@@ -1466,7 +1466,7 @@ msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
msgstr ""
#: ../fdroidserver/nightly.py
msgid "The the file to be included in the repo (path or glob)"
msgid "The file to be included in the repo (path or glob)"
msgstr ""
#: ../fdroidserver/publish.py
......
......@@ -1463,7 +1463,7 @@ msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
msgstr ""
#: ../fdroidserver/nightly.py
msgid "The the file to be included in the repo (path or glob)"
msgid "The file to be included in the repo (path or glob)"
msgstr ""
#: ../fdroidserver/publish.py
......
......@@ -1402,7 +1402,7 @@ msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
msgstr ""
#: ../fdroidserver/nightly.py
msgid "The the file to be included in the repo (path or glob)"
msgid "The file to be included in the repo (path or glob)"
msgstr ""
#: ../fdroidserver/publish.py
......
......@@ -1408,7 +1408,7 @@ msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
msgstr ""
#: ../fdroidserver/nightly.py
msgid "The the file to be included in the repo (path or glob)"
msgid "The file to be included in the repo (path or glob)"
msgstr ""
#: ../fdroidserver/publish.py
......
......@@ -1431,7 +1431,7 @@ msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
msgstr ""
#: ../fdroidserver/nightly.py
msgid "The the file to be included in the repo (path or glob)"
msgid "The file to be included in the repo (path or glob)"
msgstr ""
#: ../fdroidserver/publish.py
......
......@@ -1413,7 +1413,7 @@ msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
msgstr ""
#: ../fdroidserver/nightly.py
msgid "The the file to be included in the repo (path or glob)"
msgid "The file to be included in the repo (path or glob)"
msgstr ""
#: ../fdroidserver/publish.py
......
......@@ -1465,7 +1465,7 @@ msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
msgstr ""
#: ../fdroidserver/nightly.py
msgid "The the file to be included in the repo (path or glob)"
msgid "The file to be included in the repo (path or glob)"
msgstr ""
#: ../fdroidserver/publish.py
......
......@@ -1408,7 +1408,7 @@ msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
msgstr ""
#: ../fdroidserver/nightly.py
msgid "The the file to be included in the repo (path or glob)"
msgid "The file to be included in the repo (path or glob)"
msgstr ""
#: ../fdroidserver/publish.py
......
......@@ -1490,7 +1490,7 @@ msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
msgstr ""
#: ../fdroidserver/nightly.py
msgid "The the file to be included in the repo (path or glob)"
msgid "The file to be included in the repo (path or glob)"
msgstr ""
#: ../fdroidserver/publish.py
......
......@@ -1419,7 +1419,7 @@ msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
msgstr ""
#: ../fdroidserver/nightly.py
msgid "The the file to be included in the repo (path or glob)"
msgid "The file to be included in the repo (path or glob)"
msgstr ""
#: ../fdroidserver/publish.py
......
......@@ -1441,7 +1441,7 @@ msgid "The root dir for local_copy_dir \"{path}\" does not exist!"
msgstr "local_copy_dir \"{path}\" 根目錄不存在!"
#: ../fdroidserver/nightly.py
msgid "The the file to be included in the repo (path or glob)"
msgid "The file to be included in the repo (path or glob)"
msgstr "包含在此軟體庫的檔案 (path 或 glob)"
#: ../fdroidserver/publish.py
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment