Merge pull request bkerler#484 from JohnSanpe/fixup-qfil

qfil: fixed path inconsistency issue when setting bootable

edlclient/Library/firehose_client.py

@@ -136,10 +136,11 @@ def check_cmd(self, func):
                 return True
         return False
 
-    def find_bootable_partition(self, rawprogram):
+    def find_bootable_partition(self, imagedir, rawprogram):
         part = -1
         for xml in rawprogram:
-            with open(xml, "r") as fl:
+            filename = os.path.join(imagedir, xml)
+            with open(filename, "r") as fl:
                 for evt, elem in ET.iterparse(fl, events=["end"]):
                     if elem.tag == "program":
                         label = elem.get("label")
@@ -957,7 +958,8 @@ def handle_firehose(self, cmd, options):
                 else:
                     self.warning(f"File : {filename} not found.")
             self.info("[qfil] patching ok")
-            bootable = self.find_bootable_partition(rawprogram)
+
+            bootable = self.find_bootable_partition(imagedir, rawprogram)
             if bootable != -1:
                 if self.firehose.cmd_setbootablestoragedrive(bootable):
                     self.info("[qfil] partition({partition}) is now bootable\n".format(partition=bootable))