]> granicus.if.org Git - esp-idf/commitdiff
cmake idf.py: Print flasher file arguments in order of file offset
authorAngus Gratton <angus@espressif.com>
Fri, 31 Aug 2018 04:29:38 +0000 (12:29 +0800)
committerAngus Gratton <gus@projectgus.com>
Fri, 31 Aug 2018 04:29:38 +0000 (12:29 +0800)
Previously, order was random

tools/idf.py

index bb55ff59eb2fb85090cc8e04346b183032282a63..1f017e7fce6de5a29e65507e6190e5780152914e 100755 (executable)
@@ -338,7 +338,8 @@ def print_closing_message(args):
             cmd += flasher_path(flasher_args[key]["file"])
         else:  # flashing the whole project
             cmd = " ".join(flasher_args["write_flash_args"]) + " "
-            flash_items = sorted((o,f) for (o,f) in flasher_args["flash_files"].items() if len(o) > 0)
+            flash_items = sorted(((o,f) for (o,f) in flasher_args["flash_files"].items() if len(o) > 0),
+                                 key = lambda (o,_): int(o, 0))
             for o,f in flash_items:
                 cmd += o + " " + flasher_path(f) + " "