1 |
commit: 916b92e8a987b403fa73f27dd0d2d7e3a44c44ad |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jun 19 19:10:39 2021 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jun 19 19:10:39 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/javatoolkit.git/commit/?id=916b92e8 |
7 |
|
8 |
correctly handling java versions in class-version-verify.py |
9 |
|
10 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
11 |
|
12 |
src/py/class-version-verify.py | 2 -- |
13 |
src/py/javatoolkit/cvv.py | 18 ++++++++++++++---- |
14 |
2 files changed, 14 insertions(+), 6 deletions(-) |
15 |
|
16 |
diff --git a/src/py/class-version-verify.py b/src/py/class-version-verify.py |
17 |
index 968618c..dc44d90 100755 |
18 |
--- a/src/py/class-version-verify.py |
19 |
+++ b/src/py/class-version-verify.py |
20 |
@@ -56,8 +56,6 @@ def main(): |
21 |
print("-t is mandatory") |
22 |
sys.exit(2) |
23 |
|
24 |
- options.version = int(options.version.split(".")[-1]) |
25 |
- |
26 |
cvv_magic = CVVMagic(options.version) |
27 |
|
28 |
for arg in args: |
29 |
|
30 |
diff --git a/src/py/javatoolkit/cvv.py b/src/py/javatoolkit/cvv.py |
31 |
index 1f15415..b0fdc84 100644 |
32 |
--- a/src/py/javatoolkit/cvv.py |
33 |
+++ b/src/py/javatoolkit/cvv.py |
34 |
@@ -10,18 +10,28 @@ from zipfile import ZipFile |
35 |
|
36 |
class CVVMagic: |
37 |
def __init__(self, target): |
38 |
- self.target = target |
39 |
+ # this is a number 8 9 10 11 etc, not including 1. |
40 |
+ if '.' in target: |
41 |
+ self.target = int(target.split(".")[-1]) |
42 |
+ else: |
43 |
+ self.target = int(target) |
44 |
self.good = [] |
45 |
self.bad = [] |
46 |
self.skipped = [] |
47 |
|
48 |
def add(self, version, jar, file): |
49 |
if file == "module-info.class" and self.target < 9: |
50 |
- self.skipped.append(("1.%s" % (version), jar, file)) |
51 |
+ self.skipped.append((version, jar, file)) |
52 |
elif version <= self.target: |
53 |
- self.good.append(("1.%s" % (version), jar, file)) |
54 |
+ if version < 9: |
55 |
+ self.good.append(("1.%s" % (version), jar, file)) |
56 |
+ else: |
57 |
+ self.good.append((version, jar, file)) |
58 |
else: |
59 |
- self.bad.append(("1.%s" % (version), jar, file)) |
60 |
+ if version < 9: |
61 |
+ self.bad.append(("1.%s" % (version), jar, file)) |
62 |
+ else: |
63 |
+ self.bad.append((version, jar, file)) |
64 |
|
65 |
def do_class(self,filename): |
66 |
classFile = file(filename,"rb") |