From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Date: Wed, 6 Dec 2023 20:55:31 +0000 (+0100)
Subject: devtool: modify: Make --no-extract work again
X-Git-Tag: uninative-4.4~796
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a44fb10ef4b90ee24f470362007d56183abc593;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

devtool: modify: Make --no-extract work again

This avoids the following error when using --no-extract, introduced in
commit 900129cbdf (devtool: add support for git submodules):

  Traceback (most recent call last):
    File ".../scripts/devtool", line 349, in <module>
      ret = main()
    File ".../scripts/devtool", line 336, in main
      ret = args.func(args, config, basepath, workspace)
    File ".../scripts/lib/devtool/standard.py", line 995, in modify
      for commit in commits[name]:
  KeyError: '.'

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 16ea328c6a2..c5b6458d068 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -993,7 +993,8 @@ def modify(args, config, basepath, workspace):
                 '}\n')
             if initial_revs:
                 for name, rev in initial_revs.items():
-                        f.write('\n# initial_rev %s: %s\n' % (name, rev))
+                    f.write('\n# initial_rev %s: %s\n' % (name, rev))
+                    if name in commits:
                         for commit in commits[name]:
                             f.write('# commit %s: %s\n' % (name, commit))
             if branch_patches: