From: Daniel Martí <mvdan@mvdan.cc>
Date: Sat, 26 Sep 2015 23:53:08 +0000 (-0700)
Subject: fdroid: don't treat MetaDataException as unknown
X-Git-Tag: 0.5.0~72
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=9c3fd9753045e3f34a42166fb8e93827f2700b25;p=fdroidserver.git

fdroid: don't treat MetaDataException as unknown

Up until now, if it was thrown, fdroid would crash with a full stacktrace as
if the program had stopped unexpectedly. Now it just prints the metadata
error, as intended.
---

diff --git a/fdroid b/fdroid
index 33a60251..9199ee65 100755
--- a/fdroid
+++ b/fdroid
@@ -22,6 +22,7 @@ import sys
 import logging
 
 import fdroidserver.common
+import fdroidserver.metadata
 from argparse import ArgumentError
 
 commands = {
@@ -118,7 +119,8 @@ def main():
     try:
         mod.main()
     # These are ours, contain a proper message and are "expected"
-    except fdroidserver.common.FDroidException, e:
+    except (fdroidserver.common.FDroidException,
+            fdroidserver.metadata.MetaDataException) as e:
         if verbose:
             raise
         else: