builder: py2 fixes

Relates: https://pagure.io/koji/issue/1905

builder/kojid

@@ -4991,24 +4991,22 @@ class BuildSRPMFromSCMTask(BaseBuildTask):
         elif len(spec_files) > 1:
             # If there are multiple spec files, check whether one of them
             # matches the SCM repo name
-            scm_spec_options = [
-                "%s/%s.spec".format(
-                    sourcedir, os.path.basename(sourcedir)),
-
-                "%s/SPECS/%s.spec".format(
-                    sourcedir, os.path.basename(sourcedir))
-            ]
+            scm_spec_options = (
+                "%s/%s.spec" % (sourcedir, os.path.basename(sourcedir)),
+                "%s/SPECS/%s.spec" % (sourcedir, os.path.basename(sourcedir)),
+            )
 
+            spec_file = None
             for scm_spec in scm_spec_options:
-                if scm_spec in specs:
+                if scm_spec in spec_files:
                     # We have a match, so use this one.
                     spec_file = scm_spec
                     break
 
             if not spec_file:
                 # We didn't find an exact match, so throw an error
-                raise koji.BuildError(
-                    "Multiple spec files found: %s" % spec_files)
+                raise koji.BuildError("Multiple spec files found but none is matching "
+                                      "SCM checkout dir name: %s" % spec_files)
         else:
             spec_file = spec_files[0]
 

docs/source/server_howto.rst

@@ -1224,6 +1224,10 @@ a host, but allow from it otherwise
 
 The explicit block syntax was added in version 1.13.0.
 
+SCM checkout can contain multiple spec files (checkouted or created by
+``source_cmd``). In such case spec file named same as a checkout directory will
+be selected.
+
 
 Add the host to the createrepo channel
 --------------------------------------