Merge remote-tracking branch 'gitignore/kindlegen-patch-20170301'

This commit is contained in:
OzzieIsaacs 2017-03-01 18:02:59 +01:00
commit 01a1f838f5

View File

@ -1033,7 +1033,7 @@ def stats():
categorys = len(db.session.query(db.Tags).all()) categorys = len(db.session.query(db.Tags).all())
series = len(db.session.query(db.Series).all()) series = len(db.session.query(db.Series).all())
versions = uploader.book_formats.get_versions() versions = uploader.book_formats.get_versions()
vendorpath = os.path.join(config.get_main_dir + "vendor" + os.sep) vendorpath = os.path.join(config.get_main_dir, "vendor")
if sys.platform == "win32": if sys.platform == "win32":
kindlegen = os.path.join(vendorpath, u"kindlegen.exe") kindlegen = os.path.join(vendorpath, u"kindlegen.exe")
else: else: