[javapackages] Fix OSGi provides and requires generators to not fail(i.e. not run) when a jar file is missing a man
by Alexander Kurtakov
commit a31565b55bee767531dd8bcf08316f3ec7f6577f
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Tue Sep 13 20:49:14 2011 +0300
Fix OSGi provides and requires generators to not fail(i.e. not run) when
a jar file is missing a manifest file.
depgenerators/osgi.prov | 5 +++--
depgenerators/osgi.req | 11 ++++++-----
2 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/depgenerators/osgi.prov b/depgenerators/osgi.prov
index 2548adf..49b3ace 100755
--- a/depgenerators/osgi.prov
+++ b/depgenerators/osgi.prov
@@ -77,8 +77,9 @@ class TagBuilder:
self.handle_manifest(manifest)
if zipfile.is_zipfile(path):
jarfile = ZipFile(path)
- manifest = jarfile.open("META-INF/MANIFEST.MF")
- self.handle_manifest(manifest)
+ if "META-INF/MANIFEST.MF" in jarfile.namelist():
+ manifest = jarfile.open("META-INF/MANIFEST.MF")
+ self.handle_manifest(manifest)
if __name__ == "__main__":
diff --git a/depgenerators/osgi.req b/depgenerators/osgi.req
index 0ad2a75..901d64e 100755
--- a/depgenerators/osgi.req
+++ b/depgenerators/osgi.req
@@ -78,11 +78,12 @@ class TagBuilder:
if not os.path.islink(path):
if zipfile.is_zipfile(path):
jarfile = ZipFile(path)
- manifest = jarfile.open("META-INF/MANIFEST.MF")
- headers = self.parse_manifest(manifest)
- if headers.get("Require-Bundle"):
- for bundle in self.split_bundle_name(headers.get("Require-Bundle")):
- print "osgi(%s)" %(bundle)
+ if "META-INF/MANIFEST.MF" in jarfile.namelist():
+ manifest = jarfile.open("META-INF/MANIFEST.MF")
+ headers = self.parse_manifest(manifest)
+ if headers.get("Require-Bundle"):
+ for bundle in self.split_bundle_name(headers.get("Require-Bundle")):
+ print "osgi(%s)" %(bundle)
if __name__ == "__main__":
builder = TagBuilder ()
12 years, 8 months
[javapackages/0.2.x] Fix OSGi provides and requires generators to not fail(i.e. not run) when a jar file is missing a man
by Alexander Kurtakov
commit 8150fb0157fa0bedce2f0f191d55cecec3708626
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Tue Sep 13 20:49:14 2011 +0300
Fix OSGi provides and requires generators to not fail(i.e. not run) when
a jar file is missing a manifest file.
depgenerators/osgi.prov | 5 +++--
depgenerators/osgi.req | 11 ++++++-----
2 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/depgenerators/osgi.prov b/depgenerators/osgi.prov
index 2548adf..49b3ace 100755
--- a/depgenerators/osgi.prov
+++ b/depgenerators/osgi.prov
@@ -77,8 +77,9 @@ class TagBuilder:
self.handle_manifest(manifest)
if zipfile.is_zipfile(path):
jarfile = ZipFile(path)
- manifest = jarfile.open("META-INF/MANIFEST.MF")
- self.handle_manifest(manifest)
+ if "META-INF/MANIFEST.MF" in jarfile.namelist():
+ manifest = jarfile.open("META-INF/MANIFEST.MF")
+ self.handle_manifest(manifest)
if __name__ == "__main__":
diff --git a/depgenerators/osgi.req b/depgenerators/osgi.req
index 0ad2a75..901d64e 100755
--- a/depgenerators/osgi.req
+++ b/depgenerators/osgi.req
@@ -78,11 +78,12 @@ class TagBuilder:
if not os.path.islink(path):
if zipfile.is_zipfile(path):
jarfile = ZipFile(path)
- manifest = jarfile.open("META-INF/MANIFEST.MF")
- headers = self.parse_manifest(manifest)
- if headers.get("Require-Bundle"):
- for bundle in self.split_bundle_name(headers.get("Require-Bundle")):
- print "osgi(%s)" %(bundle)
+ if "META-INF/MANIFEST.MF" in jarfile.namelist():
+ manifest = jarfile.open("META-INF/MANIFEST.MF")
+ headers = self.parse_manifest(manifest)
+ if headers.get("Require-Bundle"):
+ for bundle in self.split_bundle_name(headers.get("Require-Bundle")):
+ print "osgi(%s)" %(bundle)
if __name__ == "__main__":
builder = TagBuilder ()
12 years, 8 months
[lucene] Fix duplicate Manifes-version warnings.
by Alexander Kurtakov
commit b6aae3b4590d6b427f34ee14e4e9688b7e46f7fc
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Mon Sep 12 17:10:04 2011 +0300
Fix duplicate Manifes-version warnings.
lucene-2.9.4-analysis-OSGi-MANIFEST.MF | 1 -
lucene-2.9.4-core-OSGi-MANIFEST.MF | 1 -
lucene.spec | 5 ++++-
3 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/lucene-2.9.4-analysis-OSGi-MANIFEST.MF b/lucene-2.9.4-analysis-OSGi-MANIFEST.MF
index b39bbc4..ab7964b 100644
--- a/lucene-2.9.4-analysis-OSGi-MANIFEST.MF
+++ b/lucene-2.9.4-analysis-OSGi-MANIFEST.MF
@@ -1,4 +1,3 @@
-Manifest-Version: 1.0
Bundle-Vendor: Fedora Project
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/lucene-2.9.4-core-OSGi-MANIFEST.MF b/lucene-2.9.4-core-OSGi-MANIFEST.MF
index 95f84e3..e86a6a7 100644
--- a/lucene-2.9.4-core-OSGi-MANIFEST.MF
+++ b/lucene-2.9.4-core-OSGi-MANIFEST.MF
@@ -1,4 +1,3 @@
-Manifest-Version: 1.0
Bundle-Vendor: Fedora Project
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/lucene.spec b/lucene.spec
index c24c830..fdb8704 100644
--- a/lucene.spec
+++ b/lucene.spec
@@ -31,7 +31,7 @@
Summary: High-performance, full-featured text search engine
Name: lucene
Version: 2.9.4
-Release: 6%{?dist}
+Release: 7%{?dist}
Epoch: 0
License: ASL 2.0
URL: http://lucene.apache.org/
@@ -212,6 +212,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%{_javadir}/%{name}-demos.jar
%changelog
+* Mon Sep 12 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:2.9.4-7
+- Fix duplicate Manifes-version warnings.
+
* Mon Jun 27 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:2.9.4-6
- BR zip - fixes FTBFS.
12 years, 8 months