Fix spack flake8 to use Travis's target as base when needed

This commit is contained in:
Todd Gamblin
2019-04-22 21:55:20 +09:00
committed by Peter Scheibel
parent f41103770d
commit 8e5e36dc0b
2 changed files with 7 additions and 3 deletions

View File

@@ -96,7 +96,11 @@ def changed_files(args):
git = which('git', required=True)
range = "{0}...".format(args.base)
base = args.base
if base is None:
base = os.environ.get('TRAVIS_BRANCH', 'develop')
range = "{0}...".format(base)
git_args = [
# Add changed files committed since branching off of develop
@@ -193,7 +197,7 @@ def filter_file(source, dest, output=False):
def setup_parser(subparser):
subparser.add_argument(
'-b', '--base', action='store', default='develop',
'-b', '--base', action='store', default=None,
help="select base branch for collecting list of modified files")
subparser.add_argument(
'-k', '--keep-temp', action='store_true',