44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
From 642f1828322489c6b5b0e450994a3d8a5836d56f Mon Sep 17 00:00:00 2001
|
|
From: Michal Srb <msrb@redhat.com>
|
|
Date: Tue, 10 Jun 2014 16:19:18 +0200
|
|
Subject: [PATCH] [artifact] Generate provides for compat artifacts with
|
|
alliases
|
|
|
|
---
|
|
python/javapackages/artifact.py | 10 ++++++----
|
|
1 file changed, 6 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/python/javapackages/artifact.py b/python/javapackages/artifact.py
|
|
index c6afc34..fc3f245 100644
|
|
--- a/python/javapackages/artifact.py
|
|
+++ b/python/javapackages/artifact.py
|
|
@@ -108,19 +108,21 @@ class ProvidedArtifact(object):
|
|
strlist = []
|
|
if not self.compatVersions:
|
|
strlist.append(self.artifact.get_rpm_str())
|
|
+ for alias in self.aliases:
|
|
+ full_alias = Artifact.merge_artifacts(alias.artifact, self.artifact)
|
|
+ strlist.append(full_alias.get_rpm_str())
|
|
else:
|
|
for ver in self.compatVersions:
|
|
rpmstr = self.artifact.get_rpm_str(ver)
|
|
strlist.append(rpmstr)
|
|
+ for alias in self.aliases:
|
|
+ full_alias = Artifact.merge_artifacts(alias.artifact, self.artifact)
|
|
+ strlist.append(full_alias.get_rpm_str(ver))
|
|
|
|
if not (self.version):
|
|
raise ArtifactFormatException(
|
|
"Cannot create versioned string from artifact without version: {art}".format(art=str(self)))
|
|
|
|
- for alias in self.aliases:
|
|
- full_alias = Artifact.merge_artifacts(alias.artifact, self.artifact)
|
|
- strlist.append(full_alias.get_rpm_str())
|
|
-
|
|
result = ""
|
|
for rpmstr in strlist:
|
|
if result:
|
|
--
|
|
1.9.3
|
|
|