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

Commit 47d6f3e5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update caremap to by py3 compatible" am: 18370833 am: 61707b97 am:... 

Merge "Update caremap to by py3 compatible" am: 18370833 am: 61707b97 am: dfeacf45 am: ab99890f

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1855545

Change-Id: Ia4b3c4bf5e1935a8dbfb925c1a1e365ba79af3a6
parents bd0f2106 ab99890f

update_verifier/care_map_generator.py

+2 −2
Original line number Diff line number Diff line
@@ -111,14 +111,14 @@ def main(argv): 
  logging.basicConfig(level=logging.INFO if args.verbose else logging.WARNING,

                      format=logging_format)



  with open(args.input_care_map, 'r') as input_care_map:

  with open(args.input_care_map, 'rb') as input_care_map:

    content = input_care_map.read()



  if args.parse_proto:

    result = ParseProtoMessage(content, args.fingerprint_enabled).encode()

  else:

    care_map_proto = GenerateCareMapProtoFromLegacyFormat(

        content.rstrip().splitlines(), args.fingerprint_enabled)

        content.decode().rstrip().splitlines(), args.fingerprint_enabled)

    result = care_map_proto.SerializeToString()



  with open(args.output_file, 'wb') as output: