mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-19 03:30:12 +02:00
handle all cases of @ in srclibs
expands on fdroidserver!1422
This commit is contained in:
parent
599bd5a3a1
commit
15b983f48d
@ -2059,15 +2059,15 @@ def parse_srclib_spec(spec):
|
||||
"(not a string): '{}'")
|
||||
.format(spec))
|
||||
|
||||
tokens = spec.split('@')
|
||||
if len(tokens) > 2:
|
||||
raise MetaDataException(_("could not parse srclib spec "
|
||||
"(too many '@' signs): '{}'")
|
||||
.format(spec))
|
||||
elif len(tokens) < 2:
|
||||
raise MetaDataException(_("could not parse srclib spec "
|
||||
"(no ref specified): '{}'")
|
||||
.format(spec))
|
||||
tokens = spec.split('@', 1)
|
||||
if not tokens[0]:
|
||||
raise MetaDataException(
|
||||
_("could not parse srclib spec (no name specified): '{}'").format(spec)
|
||||
)
|
||||
if len(tokens) < 2 or not tokens[1]:
|
||||
raise MetaDataException(
|
||||
_("could not parse srclib spec (no ref specified): '{}'").format(spec)
|
||||
)
|
||||
|
||||
name = tokens[0]
|
||||
ref = tokens[1]
|
||||
|
@ -1514,13 +1514,27 @@ class CommonTest(unittest.TestCase):
|
||||
self.assertEqual(fdroidserver.common.parse_srclib_spec('1:Support/v7/appcompat@android-4.4_r1.1'),
|
||||
('Support', 'android-4.4_r1.1', '1', 'v7/appcompat'))
|
||||
|
||||
def test_parse_srclib_spec_bad(self):
|
||||
def test_parse_srclib_spec_many_ats(self):
|
||||
self.assertEqual(
|
||||
fdroidserver.common.parse_srclib_spec('foo@@v2'), ('foo', '@v2', None, None)
|
||||
)
|
||||
self.assertEqual(
|
||||
fdroidserver.common.parse_srclib_spec('bar@2@f'), ('bar', '2@f', None, None)
|
||||
)
|
||||
|
||||
def test_parse_srclib_spec_none(self):
|
||||
with self.assertRaises(MetaDataException):
|
||||
self.assertEqual(fdroidserver.common.parse_srclib_spec(None))
|
||||
fdroidserver.common.parse_srclib_spec(None)
|
||||
|
||||
def test_parse_srclib_spec_no_ref(self):
|
||||
with self.assertRaises(MetaDataException):
|
||||
self.assertEqual(fdroidserver.common.parse_srclib_spec('no-ref'))
|
||||
fdroidserver.common.parse_srclib_spec('no-ref')
|
||||
with self.assertRaises(MetaDataException):
|
||||
self.assertEqual(fdroidserver.common.parse_srclib_spec('@multi@at-signs@'))
|
||||
fdroidserver.common.parse_srclib_spec('noref@')
|
||||
|
||||
def test_parse_srclib_spec_no_name(self):
|
||||
with self.assertRaises(MetaDataException):
|
||||
fdroidserver.common.parse_srclib_spec('@ref')
|
||||
|
||||
def test_remove_signing_keys(self):
|
||||
shutil.copytree(
|
||||
|
Loading…
Reference in New Issue
Block a user