commit aa2f467f930466bf919a24d62150c1418ffdd816
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Jul 7 09:05:13 2014 +0200
[maven.req] Attempt to fix rhbz#1116413
depgenerators/maven.req | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/depgenerators/maven.req b/depgenerators/maven.req
index 5da8933..338b6ec 100755
--- a/depgenerators/maven.req
+++ b/depgenerators/maven.req
@@ -96,6 +96,7 @@ class TagBuilder(object):
paths = [line.rstrip() for line in filelist.readlines()]
self.provided_artifacts = []
+ self.provided_osgi = []
self.skipped_artifacts = []
if paths:
# let's first read all metadata files for provided artifacts
@@ -109,6 +110,7 @@ class TagBuilder(object):
metadata = Metadata(metadata_paths)
self.provided_artifacts.extend(metadata.get_provided_artifacts())
+ self.provided_osgi.extend(metadata.get_osgi_provides())
self.skipped_artifacts.extend(metadata.get_skipped_artifacts())
# list of all installed POM files
@@ -332,10 +334,10 @@ class TagBuilder(object):
osgi_reqs = metadata.get_osgi_requires()
osgi_provs = metadata.get_osgi_provides()
for req in osgi_reqs:
- if req in osgi_provs:
- print("osgi({osgi_id}) = {version}".format(osgi_id=req,
version=osgi_provs[req]))
- else:
+ if req not in self.provided_osgi:
print("osgi({osgi_id})".format(osgi_id=req))
+ elif req not in osgi_provs:
+ print("osgi({osgi_id} = {version})".format(osgi_id=req,
version=self.provided_osgi[req]))
def find_what_requires(self, artifact):
Show replies by date