| 1 |
commit: 09739b1ae090fc1944a1267ed4c40cf58ce7d049 |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 19 17:34:56 2021 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 19 17:35:25 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/javatoolkit.git/commit/?id=09739b1a |
| 7 |
|
| 8 |
fixed handling of module-info.class |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/742935 |
| 11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
| 12 |
|
| 13 |
src/py/class-version-verify.py | 8 +++++--- |
| 14 |
src/py/javatoolkit/cvv.py | 5 ++++- |
| 15 |
2 files changed, 9 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/src/py/class-version-verify.py b/src/py/class-version-verify.py |
| 18 |
index e4ee7c8..968618c 100755 |
| 19 |
--- a/src/py/class-version-verify.py |
| 20 |
+++ b/src/py/class-version-verify.py |
| 21 |
@@ -81,10 +81,12 @@ def main(): |
| 22 |
if not options.silent: |
| 23 |
for set in cvv_magic.bad: |
| 24 |
print("Bad: %s %s %s" % set) |
| 25 |
+ for set in cvv_magic.skipped: |
| 26 |
+ print("Skipped: %s %s %s" % set) |
| 27 |
|
| 28 |
- print("CVV: %s\nChecked: %i Good: %i Bad: %i" % |
| 29 |
- (options.version, len(cvv_magic.good) + |
| 30 |
- len(cvv_magic.bad), len(cvv_magic.good), len(cvv_magic.bad))) |
| 31 |
+ print("CVV: %s\nChecked: %i Good: %i Bad: %i Skipped: %i" % |
| 32 |
+ (options.version, len(cvv_magic.good) + len(cvv_magic.bad) + len(cvv_magic.skipped), |
| 33 |
+ len(cvv_magic.good), len(cvv_magic.bad), len(cvv_magic.skipped))) |
| 34 |
|
| 35 |
if len(cvv_magic.bad) > 0: |
| 36 |
sys.exit(1) |
| 37 |
|
| 38 |
diff --git a/src/py/javatoolkit/cvv.py b/src/py/javatoolkit/cvv.py |
| 39 |
index 6ae2501..1f15415 100644 |
| 40 |
--- a/src/py/javatoolkit/cvv.py |
| 41 |
+++ b/src/py/javatoolkit/cvv.py |
| 42 |
@@ -13,9 +13,12 @@ class CVVMagic: |
| 43 |
self.target = target |
| 44 |
self.good = [] |
| 45 |
self.bad = [] |
| 46 |
+ self.skipped = [] |
| 47 |
|
| 48 |
def add(self, version, jar, file): |
| 49 |
- if version <= self.target: |
| 50 |
+ if file == "module-info.class" and self.target < 9: |
| 51 |
+ self.skipped.append(("1.%s" % (version), jar, file)) |
| 52 |
+ elif version <= self.target: |
| 53 |
self.good.append(("1.%s" % (version), jar, file)) |
| 54 |
else: |
| 55 |
self.bad.append(("1.%s" % (version), jar, file)) |
Archives