commit 2d7b96e60e07e40f7791a98ad4d1be13ba895928
author Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 25 15:50:05 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 25 15:50:05 2019 +0000
tree fbfb310d09cfd7f14290110424a361ad247878b9
parent 558bd75ef0eb86629c8d561b94ce15544910ee06
parent 3cf5c723053a907bc20fa790e2a339d14551ba87

Merge "Adds avb_headers"

avbtool

diff --git a/avbtool b/avbtool
index ce48155..665c24e 100755
--- a/avbtool
+++ b/avbtool
@@ -1386,6 +1386,7 @@
       True if the descriptor verifies, False otherwise.
     """
     if self.partition_name == '':
+      image_filename = image_containing_descriptor.filename
       image = image_containing_descriptor
     else:
       image_filename = os.path.join(image_dir, self.partition_name + image_ext)
@@ -1416,7 +1417,7 @@
     else:
       if hash_tree != hash_tree_ondisk:
         sys.stderr.write('hashtree of {} contains invalid data\n'.
-                       format(image_filename))
+                         format(image_filename))
         return False
       print ('{}: Successfully verified {} hashtree of {} for image of {} bytes'
              .format(self.partition_name, self.hash_algorithm, image.filename,
@@ -1549,6 +1550,7 @@
       True if the descriptor verifies, False otherwise.
     """
     if self.partition_name == '':
+      image_filename = image_containing_descriptor.filename
       image = image_containing_descriptor
     else:
       image_filename = os.path.join(image_dir, self.partition_name + image_ext)