1
0
mirror of https://github.com/openSUSE/osc.git synced 2024-11-10 06:46:15 +01:00

- fix failure of aggregatepac when target package exists only via project link

This commit is contained in:
Adrian Schröter 2011-03-30 14:12:59 +02:00
parent be4f1f350e
commit 802925c216

View File

@ -3214,6 +3214,7 @@ def meta_exists(metatype,
data = StringIO(data % template_args).readlines()
else:
raise e
return data
def make_meta_url(metatype, path_args=None, apiurl=None, force=False):
@ -4275,7 +4276,14 @@ def aggregate_pac(src_project, src_package, dst_project, dst_package, repo_map =
path_args=(quote_plus(dst_project), quote_plus(dst_package)),
template_args=None,
create_new=False, apiurl=apiurl)
root = ET.fromstring(''.join(dst_meta))
if root.get('project') != dst_project:
# The source comes from a different project via a project link, we need to create this instance
meta_change = True
except:
meta_change = True
if meta_change:
src_meta = show_package_meta(apiurl, src_project, src_package)
dst_meta = replace_pkg_meta(src_meta, dst_package, dst_project)
meta_change = True