From 31b879832fe4ef1ec7e33a7573d3c1bc27d3da61 Mon Sep 17 00:00:00 2001 From: ZhuoX Li Date: Wed, 30 Apr 2014 17:33:54 +0800 Subject: [PATCH] Change the way of dealing with has_images() After adding filter, some repos have no ks. so need to make a distinction between not have image-configuration package, and not have ks. Change-Id: I5088c35a2c23f79557f277ccf0e04418c28ae471 --- job_pre_release_obs.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/job_pre_release_obs.py b/job_pre_release_obs.py index 7e3bb21..94f36d1 100755 --- a/job_pre_release_obs.py +++ b/job_pre_release_obs.py @@ -129,13 +129,20 @@ def make_repo(project, repo, backenddb, base_url, base_path, live_repo_base): # let's take it from target repo, only one package repo is enough # Add image configuration to prerelease repo - for rpm in find_files(os.path.join(snapshot.path, 'repos', repo['Name']), + img_conf = find_files(os.path.join(snapshot.path, 'repos', repo['Name']), prefix="image-configurations-", - suffix='noarch.rpm'): + suffix='noarch.rpm') + img_conf_list = list(img_conf) + # whether exist package of image-configuration + if not img_conf_list: + raise LocalError("Image configuration not found in %s" % + snapshot.path) + for rpm in img_conf_list: repomaker.load_imagedata(repo['Name'], rpm) + # whether exist ks poin to the repo if not repomaker.has_images(): - raise LocalError("Image configuration not found in %s" % snapshot.path) + continue # Update ks files images_ks = update_ks(repomaker.imagedata, snapshot.build_id, -- 2.7.4