From: Daniel Martí <mvdan@mvdan.cc>
Date: Sun, 4 Oct 2015 06:00:18 +0000 (-0700)
Subject: Simplify format parsing logic
X-Git-Tag: 0.5.0~62
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=885a3a73f1735af70523bc876290f476c7711707;p=fdroidserver.git

Simplify format parsing logic
---

diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index 530f1350..7f8fe30b 100644
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -754,15 +754,15 @@ def parse_metadata(apps, metadatapath):
 
     if metadataformat == 'txt':
         return parse_txt_metadata(apps, metadatapath)
-    elif metadataformat == 'json':
+    if metadataformat == 'json':
         return parse_json_metadata(apps, metadatapath)
-    elif metadataformat == 'xml':
+    if metadataformat == 'xml':
         return parse_xml_metadata(apps, metadatapath)
-    elif metadataformat == 'yaml':
+    if metadataformat == 'yaml':
         return parse_yaml_metadata(apps, metadatapath)
-    else:
-        logging.critical('Unknown metadata format: ' + metadatapath)
-        sys.exit(1)
+
+    logging.critical('Unknown metadata format: ' + metadatapath)
+    sys.exit(1)
 
 
 def parse_json_metadata(apps, metadatapath):