Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e58211e authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Disallow unnamed package on the bootclasspath." am: 56772d72 am: 270568dc

Change-Id: Id27e23f919dcdfbc140daf0f3f680b59fbfd1c47
parents e2c8d415 270568dc
Loading
Loading
Loading
Loading
+3 −4
Original line number Original line Diff line number Diff line
@@ -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