From df86541d62406a065f63905219ec7295e1ff6fce Mon Sep 17 00:00:00 2001 From: Kepoor Hampond Date: Wed, 15 Mar 2017 20:50:37 -0700 Subject: [PATCH] Fixed merge logic error --- irs/utils.py | 10 +++++++--- setup.py | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/irs/utils.py b/irs/utils.py index 558584c..104aa51 100644 --- a/irs/utils.py +++ b/irs/utils.py @@ -297,9 +297,13 @@ def check_sources(ripper, key, default=None, environment=False, where=None): #============ from .config import CONFIG -def check_sources(ripper, key, default=None, environment=False): - if ripper.args.get(key): - return ripper.args.get(key) +def check_sources(ripper, key, default=None, environment=False, where=None): + tmp_args = ripper.args + if where != None and ripper.args.get(where): + tmp_args = ripper.args.get(where) + + if tmp_args.get(key): + return tmp_args.get(key) elif CONFIG.get(key): return CONFIG.get(key) elif os.environ.get(key) and environment == True: diff --git a/setup.py b/setup.py index fdb9113..8a6ad0a 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup setup( name='irs', - version='6.1.2', + version='6.2.2', description='A music downloader that just gets metadata.', url='https://github.com/kepoorhampond/irs', author='Kepoor Hampond',