From: Yonghee Han Date: Tue, 29 Aug 2017 07:32:53 +0000 (+0900) Subject: Do not change the content for the qemu_aggregate package X-Git-Tag: submit/trunk/20190927.012743~307 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F10%2F146510%2F1;p=services%2Fjenkins-scripts.git Do not change the content for the qemu_aggregate package PROBLEM : Base SRs have a broken error for the qemu_aggregate package SOLUTION: Do not change the content for the qemu_aggregate package Change-Id: I16d16052bfce29388212e7fc34c43c1784502c36 --- diff --git a/common/workflow.py b/common/workflow.py index 9bcdd12..1d55a04 100644 --- a/common/workflow.py +++ b/common/workflow.py @@ -348,19 +348,21 @@ def create_related_packages(build, obs_target_prj, obs_pre_prj, pre_package): content = "" with open(aggregate_file_name, 'r') as f: content = f.read() - content_xml_root = ElementTree.fromstringlist(content) - for element in content_xml_root.findall('aggregate'): - element.set('project',obs_pre_prj) - content = ElementTree.tostring(content_xml_root) - with open(aggregate_file_name, 'w') as f: - f.write(content) - commit_msg="uploaded to copy pac %s/%s from %s" % (obs_pre_prj, package, obs_target_prj) - try: - build.commit_files(obs_pre_prj, package, - [(aggregate_file_name, True)], commit_msg) - except ObsError, error: - raise UploadError("Unable to upload _aggregate to %s: %s" % \ - (obs_pre_prj, error)) + + if not re.search("qemu_aggregate", package): + content_xml_root = ElementTree.fromstringlist(content) + for element in content_xml_root.findall('aggregate'): + element.set('project',obs_pre_prj) + content = ElementTree.tostring(content_xml_root) + with open(aggregate_file_name, 'w') as f: + f.write(content) + commit_msg="uploaded to copy pac %s/%s from %s" % (obs_pre_prj, package, obs_target_prj) + try: + build.commit_files(obs_pre_prj, package, + [(aggregate_file_name, True)], commit_msg) + except ObsError, error: + raise UploadError("Unable to upload _aggregate to %s: %s" % \ + (obs_pre_prj, error)) print "Copypac done." def get_base_project(build, _project):