Merge branch 'clinton-hall/dev'

Conflicts:
	autoProcess/nzbToMediaEnv.py
This commit is contained in:
echel0n 2014-03-30 18:29:49 -07:00
commit 9969eaa47a
9 changed files with 119 additions and 130 deletions

View file

@ -328,7 +328,7 @@ def addnzbget():
envKeys = ['CATEGORY', 'HOST', 'PORT', 'USERNAME', 'PASSWORD', 'SSL', 'WEB_ROOT']
cfgKeys = ['mlCategory', 'host', 'port', 'username', 'password', 'ssl', 'web_root']
for index in range(len(envKeys)):
key = 'NZBPO_ML' + envKeys[index]
key = 'NZBPO_MY' + envKeys[index]
if os.environ.has_key(key):
option = cfgKeys[index]
value = os.environ[key]