Improve patterns for matching OSGi manifests

mizdebsk · Nov 20, 2014 · 4bdba50 · 4bdba50
1 parent 5039d20
commit 4bdba50
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/depgenerators/fileattrs/osgi.attr b/depgenerators/fileattrs/osgi.attr
@@ -2,4 +2,4 @@
 %__osgi_provides_opts	%{_builddir}/%{?buildsubdir}
 %__osgi_requires	%{_rpmconfigdir}/osgi.req
 %__osgi_requires_opts	%{_builddir}/%{?buildsubdir}
-%__osgi_path	^(.*\\.jar$|((%{_prefix}/lib|%{_datadir})/.*/MANIFEST.MF))
+%__osgi_path	^(.*\\.jar|((%{_prefix}/lib|%{_datadir})/.*/META-INF/MANIFEST.MF))$
diff --git a/python/javapackages/common/osgi.py b/python/javapackages/common/osgi.py
@@ -93,7 +93,7 @@ def split_bundle_name(bundles):
 
 def open_manifest(path):
     mf = None
-    if path.endswith("META-INF/MANIFEST.MF"):
+    if path.endswith("/META-INF/MANIFEST.MF"):
         mf = open(path, "rb")
     if zipfile.is_zipfile(path):
         # looks like "zipfile.is_zipfile()" is not reliable