Merge pull request #539 from bongbui321/fix_erase

fix erase to return when erase success
bkerler · Apr 26, 2024 · f3e9776 · f3e9776
2 parents 2ed24c0 + 9935d48
commit f3e9776
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/edlclient/Library/firehose_client.py b/edlclient/Library/firehose_client.py
@@ -831,7 +831,6 @@ def handle_firehose(self, cmd, options):
             luns = self.getluns(options)
             partitionname = options["<partitionname>"]
             partitions = partitionname.split(",")
-            error = False
             for lun in luns:
                 data, guid_gpt = self.firehose.get_gpt(lun, int(options["--gpt-num-part-entries"]),
                                                        int(options["--gpt-part-entry-size"]),
@@ -847,14 +846,10 @@ def handle_firehose(self, cmd, options):
                         self.printer(
                             f"Erased {partitionname} starting at sector {str(partition.sector)} " +
                             f"with sector count {str(partition.sectors)}.")
-                    else:
-                        self.printer(
-                            f"Couldn't erase partition {partitionname}. Either wrong memorytype given or no gpt partition.")
-                        error = True
-                        continue
-            if error:
-                return False
-            return True
+                        return True
+            self.error(
+                f"Couldn't erase partition {partitionname}. Either wrong memorytype given or no gpt partition.")
+            return False
         elif cmd == "ep":
             if not self.check_param(["<partitionname>", "<sectors>"]):
                 return False