#44: Harmonise environment variables with constant names

This commit is contained in:
Daniel Quinn 2016-03-01 22:39:40 +00:00
parent 26c3781350
commit 857c7ac654

View File

@ -235,8 +235,10 @@ def deprecated(before, after):
)
if not CONVERT_BINARY:
deprecated("PAPERLESS_CONVERT", "PAPERLESS_CONVERT_BINARY")
CONVERT_BINARY = os.getenv("PAPERLESS_CONVERT", "convert")
CONVERT_BINARY = "convert"
if os.getenv("PAPERLESS_CONVERT"):
deprecated("PAPERLESS_CONVERT", "PAPERLESS_CONVERT_BINARY")
CONVERT_BINARY = os.getenv("PAPERLESS_CONVERT", CONVERT_BINARY)
if not CONSUMPTION_DIR and os.getenv("PAPERLESS_CONSUME"):
deprecated("PAPERLESS_CONSUME", "PAPERLESS_CONSUMPTION_DIR")