Restore friendly error messages
Use --verbose if you really want a full traceback with your 'you made a typo in an package ID' messages. It would be better to do this based on exception types (i.e. our own exceptions - MetadataException, BuildException, VCSException) would not print a traceback, but unexpected exceptions would. But the types are not available at the 'fdroid' level currently.
This commit is contained in:
parent
6391f204e1
commit
e29da6b023
9
fdroid
9
fdroid
|
@ -83,7 +83,14 @@ def main():
|
|||
|
||||
del sys.argv[1]
|
||||
mod = __import__('fdroidserver.' + command, None, None, [command])
|
||||
mod.main()
|
||||
try:
|
||||
mod.main()
|
||||
except Exception, e:
|
||||
if verbose:
|
||||
raise
|
||||
else:
|
||||
print str(e)
|
||||
sys.exit(1)
|
||||
sys.exit(0)
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
|
|
@ -907,7 +907,7 @@ class BuildException(Exception):
|
|||
return ret
|
||||
|
||||
def __str__(self):
|
||||
ret = repr(self.value)
|
||||
ret = self.value
|
||||
if self.detail:
|
||||
ret += "\n==== detail begin ====\n%s\n==== detail end ====" % self.detail.strip()
|
||||
return ret
|
||||
|
@ -918,7 +918,7 @@ class VCSException(Exception):
|
|||
self.value = value
|
||||
|
||||
def __str__(self):
|
||||
return repr(self.value)
|
||||
return self.value
|
||||
|
||||
|
||||
# Get the specified source library.
|
||||
|
|
|
@ -23,13 +23,14 @@ import glob
|
|||
import cgi
|
||||
import logging
|
||||
|
||||
srclibs = []
|
||||
|
||||
class MetaDataException(Exception):
|
||||
def __init__(self, value):
|
||||
self.value = value
|
||||
|
||||
def __str__(self):
|
||||
return repr(self.value)
|
||||
return self.value
|
||||
|
||||
app_defaults = {
|
||||
'Name': None,
|
||||
|
|
Loading…
Reference in New Issue