metadata: handle empty YAML files without crashing

!311

diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index 258aeaf9c32f7b09a8146a1a298863128c0fd4d3..739e964a83c9f6220580c876e230432aa7d6b8cb 100644 (file)
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -989,7 +989,8 @@ def parse_json_metadata(mf, app):
 
 def parse_yaml_metadata(mf, app):
     yamldata = yaml.load(mf, Loader=YamlLoader)
-    app.update(yamldata)
+    if yamldata:
+        app.update(yamldata)
     return app
 
 

diff --git a/tests/update.TestCase b/tests/update.TestCase
index c279484c9ea9338b22d0ef62b00eba08c1d5e601..5d292f4b7e0dce25cf904193656af4282eb8c170 100755 (executable)
--- a/tests/update.TestCase
+++ b/tests/update.TestCase
@@ -500,6 +500,7 @@ class UpdateTest(unittest.TestCase):
         print('tmptestsdir', tmptestsdir)
         os.chdir(tmptestsdir)
         os.mkdir('repo')
+        os.mkdir('metadata')
         shutil.copy(os.path.join(localmodule, 'tests', 'urzip.apk'), 'repo')
 
         config = dict()
@@ -515,16 +516,23 @@ class UpdateTest(unittest.TestCase):
         fdroidserver.update.options.rename_apks = False
         fdroidserver.update.options.allow_disabled_algorithms = False
 
-        apps = fdroidserver.metadata.read_metadata(xref=True)
-        self.assertEqual(0, len(apps))
         knownapks = fdroidserver.common.KnownApks()
         apks, cachechanged = fdroidserver.update.process_apks({}, 'repo', knownapks, False)
         self.assertEqual(1, len(apks))
         apk = apks[0]
 
+        testfile = 'metadata/info.guardianproject.urzip.yml'
+        # create empty 0 byte .yml file, run read_metadata, it should work
+        open(testfile, 'a').close()
+        apps = fdroidserver.metadata.read_metadata(xref=True)
+        self.assertEqual(1, len(apps))
+        os.remove(testfile)
+
         # test using internal template
+        apps = fdroidserver.metadata.read_metadata(xref=True)
+        self.assertEqual(0, len(apps))
         fdroidserver.update.create_metadata_from_template(apk)
-        self.assertTrue(os.path.exists('metadata/info.guardianproject.urzip.yml'))
+        self.assertTrue(os.path.exists(testfile))
         apps = fdroidserver.metadata.read_metadata(xref=True)
         self.assertEqual(1, len(apps))
         for app in apps.values():
@@ -533,11 +541,11 @@ class UpdateTest(unittest.TestCase):
             break
 
         # test using external template.yml
-        os.remove('metadata/info.guardianproject.urzip.yml')
-        self.assertFalse(os.path.exists('metadata/info.guardianproject.urzip.yml'))
+        os.remove(testfile)
+        self.assertFalse(os.path.exists(testfile))
         shutil.copy(os.path.join(localmodule, 'examples', 'template.yml'), tmptestsdir)
         fdroidserver.update.create_metadata_from_template(apk)
-        self.assertTrue(os.path.exists('metadata/info.guardianproject.urzip.yml'))
+        self.assertTrue(os.path.exists(testfile))
         apps = fdroidserver.metadata.read_metadata(xref=True)
         self.assertEqual(1, len(apps))
         for app in apps.values():
@@ -545,7 +553,7 @@ class UpdateTest(unittest.TestCase):
             self.assertEqual(1, len(app['Categories']))
             self.assertEqual('Internet', app['Categories'][0])
             break
-        with open('metadata/info.guardianproject.urzip.yml') as fp:
+        with open(testfile) as fp:
             data = yaml.load(fp)
         self.assertEqual('urzip', data['Name'])
         self.assertEqual('urzip', data['Summary'])