You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pylucene-commits@lucene.apache.org by va...@apache.org on 2018/08/28 00:24:58 UTC

svn commit: r1839382 - in /lucene/pylucene/trunk/jcc: CHANGES jcc2/cpp.py jcc3/cpp.py

Author: vajda
Date: Tue Aug 28 00:24:58 2018
New Revision: 1839382

URL: http://svn.apache.org/viewvc?rev=1839382&view=rev
Log:
 - fixed bug with not skipping META-INF/ entries in .jar files

Modified:
    lucene/pylucene/trunk/jcc/CHANGES
    lucene/pylucene/trunk/jcc/jcc2/cpp.py
    lucene/pylucene/trunk/jcc/jcc3/cpp.py

Modified: lucene/pylucene/trunk/jcc/CHANGES
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/CHANGES?rev=1839382&r1=1839381&r2=1839382&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/CHANGES (original)
+++ lucene/pylucene/trunk/jcc/CHANGES Tue Aug 28 00:24:58 2018
@@ -1,7 +1,8 @@
 Version 3.1 ->
 ------------------
  - added missing 'const' breaking build with Python 3.7 (Aric Coady)
- -
+ - fixed bug with not skipping META-INF/ entries in .jar files
+ - 
 
 Version 3.0 -> 3.1
 ------------------

Modified: lucene/pylucene/trunk/jcc/jcc2/cpp.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc2/cpp.py?rev=1839382&r1=1839381&r2=1839382&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc2/cpp.py (original)
+++ lucene/pylucene/trunk/jcc/jcc2/cpp.py Tue Aug 28 00:24:58 2018
@@ -370,7 +370,7 @@ def expandjar(path):
 
     for member in jar.infolist():
         f = member.filename
-        if f.endswith('.class'):
+        if not f.startswith('META-INF/') and f.endswith('.class'):
             yield f.split('.')[0].replace('/', '.')
 
     jar.close()

Modified: lucene/pylucene/trunk/jcc/jcc3/cpp.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc3/cpp.py?rev=1839382&r1=1839381&r2=1839382&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc3/cpp.py (original)
+++ lucene/pylucene/trunk/jcc/jcc3/cpp.py Tue Aug 28 00:24:58 2018
@@ -341,7 +341,7 @@ def expandjar(path):
 
     for member in jar.infolist():
         f = member.filename
-        if f.endswith('.class'):
+        if not f.startswith('META-INF/') and f.endswith('.class'):
             yield f.split('.')[0].replace('/', '.')
 
     jar.close()