Repomaker: Fix search criteria for image configuration packages
authorEd Bartosh <eduard.bartosh@intel.com>
Sun, 4 May 2014 14:34:55 +0000 (17:34 +0300)
committerEd Bartosh <eduard.bartosh@intel.com>
Sun, 4 May 2014 14:44:06 +0000 (17:44 +0300)
With current search criteria image-configurations-*.src.rpm was
considered as image configuration binary package, which resulted
in empty list of ks files and images in repomaker structures.
This caused job_prerelease_obs to skip triggering of image creation
as .ks files were not found.

Fixes: #1844

Change-Id: I68c715dde1aa8397952e50ec83fb7d9d2c0293f7
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
common/repomaker.py

index 762b054..b75d366 100644 (file)
@@ -69,8 +69,9 @@ def collect(in_dir, archs, repo_name = None):
         is_debug = "-debugsource-" in fname or "-debuginfo-" in fname
         is_group = basename.startswith("package-groups-") and not is_debug \
             and ftype in archs
-        is_imageconf = basename.startswith("image-configurations-") and \
-                       not is_debug
+        is_imageconf = not is_debug and \
+                       basename.startswith("image-configurations-") and \
+                       basename.endswith("noarch.rpm")
         files.append((fname, ftype, is_debug, is_group, is_imageconf))
     return files