StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disallow unnamed package on the bootclasspath." am: 56772d7213 am: 270568dce5

Browse Source 
Change-Id: Id27e23f919dcdfbc140daf0f3f680b59fbfd1c47
This commit is contained in:
Automerger Merge Worker
2020-01-11 17:10:48 +00:00
parent e2c8d4155b 270568dce5
commit 4e58211e92
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/tasks/check_boot_jars/check_boot_jars.py
View File

@@ -53,10 +53,9 @@ def CheckJar(whitelist_path, jar):
if f.endswith('.class'): if f.endswith('.class'):
package_name = os.path.dirname(f) package_name = os.path.dirname(f)
package_name = package_name.replace('/', '.') package_name = package_name.replace('/', '.')
# Skip class without a package name if not package_name or not whitelist_re.match(package_name):
if package_name and not whitelist_re.match(package_name): print >> sys.stderr, ('Error: %s contains class file %s, whose package name %s is empty or'
print >> sys.stderr, ('Error: %s contains class file %s, whose package name %s is not ' ' not in the whitelist %s of packages allowed on the bootclasspath.'
'in the whitelist %s of packages allowed on the bootclasspath.'
% (jar, f, package_name, whitelist_path)) % (jar, f, package_name, whitelist_path))
return False return False
return True return True