From c89b07a9d64e97394851e729b136142f1355ead6 Mon Sep 17 00:00:00 2001 From: ZhuoX Li Date: Thu, 12 Feb 2015 15:37:16 +0800 Subject: [PATCH] Revert "Fix the aggregate packages are always broken state." This reverts commit 0cc064af0bb38cb791c41cd621af0711788f0f8c. Change-Id: I9e3139d7c6b4defcb2d3925626f8343be36f694d --- common/buildservice.py | 14 -------------- job_submit.py | 23 ----------------------- 2 files changed, 37 deletions(-) diff --git a/common/buildservice.py b/common/buildservice.py index d2cdf68..ce85842 100644 --- a/common/buildservice.py +++ b/common/buildservice.py @@ -422,20 +422,6 @@ class BuildService(OSC): self.apiurl, False) self.core_http(core.http_PUT, url, data=''.join(config)) - def copy_package_meta(self, obs_source_project, package, \ - obs_target_project): - """ - Copy xml metadata of target package to - the meta of source package - """ - meta_xml = self.get_meta(obs_target_project, package) - xml_root = ElementTree.fromstringlist(meta_xml) - project_name = xml_root.attrib.get('project') - if project_name != obs_source_project: - xml_root.attrib['project'] = obs_source_project - self.set_meta(ElementTree.tostring(xml_root), \ - obs_source_project, package) - def get_package_meta(self, project, package): """ get_package_meta(project, package) -> string diff --git a/job_submit.py b/job_submit.py index ad673b9..7ca2688 100755 --- a/job_submit.py +++ b/job_submit.py @@ -92,27 +92,6 @@ def change_release_name(build, project, git_tag): # set project config build.set_project_config(project, config) -def set_aggregate_package_meta(build, obs_source_prj, obs_target_prj): - """Set package metadata that include 'aggregate' from obs_source_prj. - Keep the metadata of aggregate packages are the same as - the obs_target_prj project - """ - for package in build.get_package_list(obs_target_prj): - if 'aggregate' in package: - # get real project name in metadata of the package - realprj = build.get_package_real_project_name(obs_source_prj, \ - package) - # If real project name is not equal obs_source_prj, - # should branch the package from obs_target_prj to - # obs_source_prj, and copy the package metadata - # of obs_target_prj to obs_source_prj - if realprj != obs_source_prj: - print "branch package %s from %s" % (package, realprj) - build.branch_pkg(realprj, package, \ - target_project = obs_source_prj) - # copy package metadata of obs_source_prj to realprj - build.copy_package_meta(obs_source_prj, package, realprj) - def copy_person_project_meta(build, obs_target_prj, obs_project): """copy the maintainer list from obs_target_prj meta to corresponding prerelease project @@ -184,8 +163,6 @@ def create_project(git_url, git_project, git_tag, git_revision, build, # prerelease project copy_person_project_meta(build, obs_target_prj, obs_project) - #change the aggregate package metadata of obs_project - set_aggregate_package_meta(build, obs_project, obs_target_prj) #create the 'link' package that relate the original package create_related_packages(build, obs_target_prj, obs_project, package) -- 2.7.4