mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-10-06 17:31:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

import: use valid placeholder values for versionCode/versionName

Browse source 
fdroid/fdroidserver!559
closes fdroid/fdroidserver#548
This commit is contained in:
Hans-Christoph Steiner 2018-10-10 15:04:45 +02:00
parent aea2589c67
commit bfdf581201
2 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
fdroidserver/import.py
View file

@ -227,11 +227,11 @@ def main():
if local_metadata_files != []: if local_metadata_files != []:
raise FDroidException(_("This repo already has local metadata: %s") % local_metadata_files[0]) raise FDroidException(_("This repo already has local metadata: %s") % local_metadata_files[0])
build = metadata.Build()
if options.url is None and os.path.isdir('.git'): if options.url is None and os.path.isdir('.git'):
app.AutoName = os.path.basename(os.getcwd()) app.AutoName = os.path.basename(os.getcwd())
app.RepoType = 'git' app.RepoType = 'git'
build = metadata.Build()
root_dir = get_subdir(os.getcwd()) root_dir = get_subdir(os.getcwd())
if os.path.exists('build.gradle'): if os.path.exists('build.gradle'):
build.gradle = ['yes'] build.gradle = ['yes']
@ -250,7 +250,6 @@ def main():
write_local_file = True write_local_file = True
elif options.url: elif options.url:
root_dir, build_dir = get_metadata_from_url(app, options.url) root_dir, build_dir = get_metadata_from_url(app, options.url)
build = metadata.Build()
build.commit = '?' build.commit = '?'
build.disable = 'Generated by import.py - check/set version fields and commit id' build.disable = 'Generated by import.py - check/set version fields and commit id'
write_local_file = False write_local_file = False
@ -286,8 +285,8 @@ def main():
raise FDroidException("Package " + package + " already exists") raise FDroidException("Package " + package + " already exists")
# Create a build line... # Create a build line...
build.versionName = versionName or '?' build.versionName = versionName or 'Unknown'
build.versionCode = versionCode or '?' build.versionCode = versionCode or '0' # TODO heinous but this is still a str
if options.subdir: if options.subdir:
build.subdir = options.subdir build.subdir = options.subdir
if options.license: if options.license:

13
tests/metadata.TestCase
View file

@ -165,7 +165,7 @@ class MetadataTest(unittest.TestCase):
with self.assertRaises(MetaDataException): with self.assertRaises(MetaDataException):
fdroidserver.metadata.parse_yaml_metadata(mf, {}) fdroidserver.metadata.parse_yaml_metadata(mf, {})
def test_write_yaml_with_allow_placeholder_values(self): def test_write_yaml_with_placeholder_values(self):
mf = io.StringIO() mf = io.StringIO()
app = fdroidserver.metadata.App() app = fdroidserver.metadata.App()
@ -177,15 +177,14 @@ class MetadataTest(unittest.TestCase):
app.AutoUpdateMode = 'None' app.AutoUpdateMode = 'None'
app.UpdateCheckMode = 'Tags' app.UpdateCheckMode = 'Tags'
build = fdroidserver.metadata.Build() build = fdroidserver.metadata.Build()
build.versionCode = 'Unknown' build.versionName = 'Unknown' # taken from fdroidserver/import.py
build.versionName = 'Unknown' build.versionCode = '0' # taken from fdroidserver/import.py
build.disable = 'Generated by import.py ...' build.disable = 'Generated by import.py ...'
build.commit = 'Unknown' build.commit = 'Unknown'
build.gradle = [True] build.gradle = [True]
app.builds = [build] app.builds = [build]
fdroidserver.metadata.write_yaml(mf, app, fdroidserver.metadata.write_yaml(mf, app)
allow_placeholder_values=True)
mf.seek(0) mf.seek(0)
self.assertEqual(mf.read(), textwrap.dedent("""\ self.assertEqual(mf.read(), textwrap.dedent("""\
@ -200,7 +199,7 @@ class MetadataTest(unittest.TestCase):
Builds: Builds:
- versionName: Unknown - versionName: Unknown
versionCode: '?' versionCode: 0
disable: Generated by import.py ... disable: Generated by import.py ...
commit: Unknown commit: Unknown
gradle: gradle:
@ -221,4 +220,4 @@ if __name__ == "__main__":
newSuite = unittest.TestSuite() newSuite = unittest.TestSuite()
newSuite.addTest(unittest.makeSuite(MetadataTest)) newSuite.addTest(unittest.makeSuite(MetadataTest))
unittest.main(failfast=False) unittest.main(failfast=True)