From afaa712350e0d0a6ee17fbb3595a3f5518e85b41 Mon Sep 17 00:00:00 2001 From: Lisa Davidson Date: Thu, 26 Mar 2020 16:41:58 -0400 Subject: [PATCH] Ccs 3469 uploader bugfixes2 (#263) * bugfix for git2import feature --- uploader/pantheon.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/uploader/pantheon.py b/uploader/pantheon.py index b913be2ea..eb102e1d3 100755 --- a/uploader/pantheon.py +++ b/uploader/pantheon.py @@ -376,9 +376,13 @@ def processRegexMatches(files, globs, filetype): if args.attrFile: if not os.path.isfile(args.directory + '/' + args.attrFile): sys.exit('attributes: ' + args.directory + '/' + args.attrFile + ' does not exist.') - - elif attributeFile and not os.path.isfile(attributeFile.strip()): - sys.exit('attributes: ' + attributeFile + ' does not exist.') + elif attributeFile: + if args.directory: + if not os.path.isfile(args.directory + '/' + attributeFile.strip()): + sys.exit('attributes2: ' + args.directory + '/' + attributeFile + ' does not exist.') + else: + if not os.path.isfile(attributeFile.strip()): + sys.exit('attributes3: ' + attributeFile + ' does not exist.') _info('Using ' + mode + ': ' + repository) _info('Using attributes: ' + attributeFile)