commit 11a28cd112419461eb82855a09387954c034c343 Author: Michal Srb msrb@redhat.com Date: Wed Jul 23 08:16:35 2014 +0200
[metadata.dependency] Implement is_skipped() and use it
depgenerators/maven.req | 8 ++------ python/javapackages/metadata/dependency.py | 9 +++++++++ 2 files changed, 11 insertions(+), 6 deletions(-) --- diff --git a/depgenerators/maven.req b/depgenerators/maven.req index 7def972..d67fd4d 100755 --- a/depgenerators/maven.req +++ b/depgenerators/maven.req @@ -133,12 +133,8 @@ class TagBuilder(object): if dependency.resolvedVersion == "UNKNOWN": unknown_deps.append(dependency) continue - for skipped in self.skipped_artifacts: - if (skipped.groupId == dependency.groupId and - skipped.artifactId == dependency.artifactId and - skipped.classifier == dependency.classifier and - skipped.extension == dependency.extension): - skipped_but_required.append(dependency) + if dependency.is_skipped(self.skipped_artifacts): + skipped_but_required.append(dependency)
# check if dependency is provided by any metadata in buildroot subpkg_dep, pkgver = dependency.is_provided_by(self.provided_artifacts) diff --git a/python/javapackages/metadata/dependency.py b/python/javapackages/metadata/dependency.py index 7d1fcb5..76ad23b 100644 --- a/python/javapackages/metadata/dependency.py +++ b/python/javapackages/metadata/dependency.py @@ -54,6 +54,15 @@ class MetadataDependency(object): break return False, None
+ def is_skipped(self, skipped_artifacts): + for skipped in skipped_artifacts: + if (self.groupId == skipped.groupId and + self.artifactId == skipped.artifactId and + self.classifier == skipped.classifier and + self.extension == skipped.extension): + return True + return False + def to_metadata(self): d = m.Dependency() d.groupId = self.groupId
java-sig-commits@lists.fedoraproject.org