Ccs 3469 uploader bugfixes2 (#263)

* bugfix for git2import feature
redhataccess · Mar 26, 2020 · afaa712 · afaa712
1 parent d8c411b
commit afaa712
Showing 1 changed file with 7 additions and 3 deletions.
diff --git 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)