chiark / gitweb /
fdroid: don't treat MetaDataException as unknown
authorDaniel Martí <mvdan@mvdan.cc>
Sat, 26 Sep 2015 23:53:08 +0000 (16:53 -0700)
committerDaniel Martí <mvdan@mvdan.cc>
Sat, 26 Sep 2015 23:53:08 +0000 (16:53 -0700)
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.

fdroid

diff --git a/fdroid b/fdroid
index 33a6025103cb8b86ef2b5e60221da8b4d2d9642c..9199ee6594313e0e4150dae16184b756a9e9897a 100755 (executable)
--- 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: