Check for duplicate entries in build.prop in validation script

Test: Added Unit test
Bug: 143013566
Change-Id: Ida14507a4a6034990bc81d5263ef1cea34f589c1
This commit is contained in:
Kelvin Zhang
2020-06-29 16:04:51 -04:00
parent 8add8cb145
commit f2e846fb91
3 changed files with 67 additions and 3 deletions

View File

@@ -397,6 +397,34 @@ def ValidateVerifiedBootImages(input_tmp, info_dict, options):
'Verified %s with avbtool (key: %s):\n%s', image, key,
stdoutdata.rstrip())
def CheckDataDuplicity(lines):
build_prop = {}
for line in lines:
if line.startswith("import") or line.startswith("#"):
continue
key, value = line.split("=", 1)
if key in build_prop:
return key
build_prop[key] = value
def CheckBuildPropDuplicity(input_tmp):
"""Check all buld.prop files inside directory input_tmp, raise error
if they contain duplicates"""
if not os.path.isdir(input_tmp):
raise ValueError("Expect {} to be a directory".format(input_tmp))
for name in os.listdir(input_tmp):
if not name.isupper():
continue
for prop_file in ['build.prop', 'etc/build.prop']:
path = os.path.join(input_tmp, name, prop_file)
if not os.path.exists(path):
continue
logging.info("Checking {}".format(path))
with open(path, 'r') as fp:
dupKey = CheckDataDuplicity(fp.readlines())
if dupKey:
raise ValueError("{} contains duplicate keys for {}", path, dupKey)
def main():
parser = argparse.ArgumentParser(
@@ -436,6 +464,8 @@ def main():
with zipfile.ZipFile(args.target_files, 'r') as input_zip:
ValidateFileConsistency(input_zip, input_tmp, info_dict)
CheckBuildPropDuplicity(input_tmp)
ValidateInstallRecoveryScript(input_tmp, info_dict)
ValidateVerifiedBootImages(input_tmp, info_dict, options)