From: Ed Bartosh Date: Sun, 4 May 2014 14:34:55 +0000 (+0300) Subject: Repomaker: Fix search criteria for image configuration packages X-Git-Tag: 1.0~151 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=93f996e9811a64e35a19446076b3ab2067bf46b6;p=services%2Fjenkins-scripts.git Repomaker: Fix search criteria for image configuration packages 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 --- diff --git a/common/repomaker.py b/common/repomaker.py index 762b054..b75d366 100644 --- a/common/repomaker.py +++ b/common/repomaker.py @@ -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