0

Don't print scary traceback when textures cannot be found

See #860
This commit is contained in:
Andrew Chin
2013-01-01 21:08:59 -05:00
parent 4222b9f3c2
commit 64cdd057fd
2 changed files with 10 additions and 1 deletions

View File

@@ -503,6 +503,10 @@ if __name__ == "__main__":
try: try:
ret = main() ret = main()
util.nice_exit(ret) util.nice_exit(ret)
except textures.TextureException, e:
# this isn't a "bug", so don't print scary traceback
logging.error(str(e))
util.nice_exit(1)
except Exception, e: except Exception, e:
logging.exception("""An error has occurred. This may be a bug. Please let us know! logging.exception("""An error has occurred. This may be a bug. Please let us know!
See http://docs.overviewer.org/en/latest/index.html#help See http://docs.overviewer.org/en/latest/index.html#help

View File

@@ -29,6 +29,11 @@ import functools
import util import util
from c_overviewer import alpha_over from c_overviewer import alpha_over
class TextureException(Exception):
"To be thrown when a texture is not found."
pass
## ##
## Textures object ## Textures object
## ##
@@ -213,7 +218,7 @@ class Textures(object):
if verbose: logging.info("Found %s in '%s'", filename, path) if verbose: logging.info("Found %s in '%s'", filename, path)
return open(path, mode) return open(path, mode)
raise IOError("Could not find the file `{0}'. Try specifying the 'texturepath' option in your config file. Set it to the directory where I can find {0}. Also see <http://docs.overviewer.org/en/latest/running/#installing-the-textures>".format(filename)) raise TextureException("Could not find the file `{0}'. Try specifying the 'texturepath' option in your config file. Set it to the directory where I can find {0}. Also see <http://docs.overviewer.org/en/latest/running/#installing-the-textures>".format(filename))
def load_image(self, filename): def load_image(self, filename):
"""Returns an image object""" """Returns an image object"""