Skip to contentSkip to conversation

devtool/standard: avoid KeyError

PATCH In review [email protected] 2 participants 5 messages Dec 26, 2023 – Jan 22, 2024 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 devtool/standard: avoid KeyError

From: Chen Qi <[email protected]>

The initial_revs["."] does not have an initial value, resulting in the following error:

KeyError: '.'

The problem could be reproduced by running:

devtool modify -n systemd </path/to/my/local/systemd/repo>

---
 scripts/lib/devtool/standard.py | 1 +
 1 file changed, 1 insertion(+)
scripts/lib/devtool/standard.py +1 -0
index 559fd45676..5d9b86ed6a 100644
@@ -905,6 +905,7 @@ def modify(args, config, basepath, workspace):
                     (stdout, _) = bb.process.run('git rev-list --reverse devtool-base..HEAD', cwd=submodule_path)
                     commits[submodule] = stdout.split()
         else:
+            initial_revs["."] = None
             if os.path.exists(os.path.join(srctree, '.git')):
                 # Check if it's a tree previously extracted by us. This is done
                 # by ensuring that devtool-base and args.branch (devtool) exist.
Signature · 1 line
2.34.1
author
#1 lore raw

ping

Quoted 37 lines · Chen Qi via lists.openembedded.org

From: Chen Qi <[email protected]>

The initial_revs["."] does not have an initial value, resulting in the following error:

   KeyError: '.'

The problem could be reproduced by running:

devtool modify -n systemd </path/to/my/local/systemd/repo>

---
  scripts/lib/devtool/standard.py | 1 +
  1 file changed, 1 insertion(+)
scripts/lib/devtool/standard.py +1 -1
index 559fd45676..5d9b86ed6a 100644
@@ -905,6 +905,7 @@ def modify(args, config, basepath, workspace):
                      (stdout, _) = bb.process.run('git rev-list --reverse devtool-base..HEAD', cwd=submodule_path)
                      commits[submodule] = stdout.split()
          else:
+            initial_revs["."] = None
              if os.path.exists(os.path.join(srctree, '.git')):
                  # Check if it's a tree previously extracted by us. This is done
                  # by ensuring that devtool-base and args.branch (devtool) exist.
 
-=-=-=-=-=-=-=-=-=-=-=-

Links: You receive all messages sent to this group.
View/Reply Online (#192906): https://lists.openembedded.org/g/openembedded-core/message/192906
Mute This Topic: https://lists.openembedded.org/mt/103366660/7304865
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#2 lore raw
In reply to [email protected]
Quoted 21 lines · Chen Qi via lists.openembedded.org

From: Chen Qi <[email protected]>

The initial_revs["."] does not have an initial value, resulting in the following error:

KeyError: '.'

The problem could be reproduced by running:

devtool modify -n systemd </path/to/my/local/systemd/repo>

---
 scripts/lib/devtool/standard.py | 1 +
 1 file changed, 1 insertion(+)
scripts/lib/devtool/standard.py +0 -0
index 559fd45676..5d9b86ed6a 100644

scripts/lib/devtool/standard.py def modify(args, config, basepath, workspace): · line 911

Quoted 7 lines
scripts/lib/devtool/standard.py +1 -0
@@ -905,6 +905,7 @@ def modify(args, config, basepath, workspace):
                     (stdout, _) = bb.process.run('git rev-list --reverse devtool-base..HEAD', cwd=submodule_path)
                     commits[submodule] = stdout.split()
         else:
+            initial_revs["."] = None
             if os.path.exists(os.path.join(srctree, '.git')):
                 # Check if it's a tree previously extracted by us. This is done
                 # by ensuring that devtool-base and args.branch (devtool) exist.

Why aren't we seeing other reports of this? How is it reproduced? Should we be adding an extra test to improve coverage?

I'm assuming this isn't related to:

https://bugzilla.yoctoproject.org/show_bug.cgi?id=15318

?

Cheers,

Richard

author
#3 lore raw
Quoted 18 lines · Richard Purdie
Quoted 16 lines · Chen Qi via lists.openembedded.org

From: Chen Qi <[email protected]>

The initial_revs["."] does not have an initial value, resulting in the following error:

   KeyError: '.'

The problem could be reproduced by running:

devtool modify -n systemd </path/to/my/local/systemd/repo>

---
  scripts/lib/devtool/standard.py | 1 +
  1 file changed, 1 insertion(+)
Quoted 13 lines

scripts/lib/devtool/standard.py def modify(args, config, basepath, workspace): · line 911

Quoted 12 lines
scripts/lib/devtool/standard.py +1 -0
index 559fd45676..5d9b86ed6a 100644
@@ -905,6 +905,7 @@ def modify(args, config, basepath, workspace):
                      (stdout, _) = bb.process.run('git rev-list --reverse devtool-base..HEAD', cwd=submodule_path)
                      commits[submodule] = stdout.split()
          else:
+            initial_revs["."] = None
              if os.path.exists(os.path.join(srctree, '.git')):
                  # Check if it's a tree previously extracted by us. This is done
                  # by ensuring that devtool-base and args.branch (devtool) exist.

Why aren't we seeing other reports of this? How is it reproduced?

I checked the devtool OEQA, there' no test case to cover this.

You can see my reproduce step in my commit message.

When I was trying to add an oeqa to this case just now, I found the problem has been fixed by the following commit.

"""

commit 64d5db2f89b4f3712b55127215ae02ce50dd747a
Author: Jamin Lin <[email protected]>
Date:   Wed Jan 3 18:13:44 2024 +0800

    devtool: modify: fix exception

    Root Cause:
    initial_revs is an empty dictionary and do not have "." key.

    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 922, in modify if not initial_revs["."]:
    KeyError: '.'

    Solution:
    check key exists, then get its value.

    (From OE-Core rev: fb0db5c48abb4d56233a175fdd349d18b972e452)

"""

So my patch can be ignored.

Regards,

Qi

Quoted 11 lines

Should we be adding an extra test to improve coverage?

I'm assuming this isn't related to:

https://bugzilla.yoctoproject.org/show_bug.cgi?id=15318

?

Cheers,

Richard

A message that is not in the archive (sent off-list or not yet received): [email protected]

author
#5 lore raw
Quoted 69 lines · Chen Qi via lists.openembedded.org
Quoted 18 lines · Richard Purdie
Quoted 16 lines · Chen Qi via lists.openembedded.org

From: Chen Qi <[email protected]>

The initial_revs["."] does not have an initial value, resulting in the following error:

   KeyError: '.'

The problem could be reproduced by running:

   devtool modify -n systemd </path/to/my/local/systemd/repo>

---
  scripts/lib/devtool/standard.py | 1 +

  1 file changed, 1 insertion(+)
Quoted 14 lines
Quoted 12 lines
scripts/lib/devtool/standard.py +0 -0
index 559fd45676..5d9b86ed6a 100644
@@ -905,6 +905,7 @@ def modify(args, config, basepath, workspace):

                      (stdout, _) = bb.process.run('git rev-list --reverse devtool-base..HEAD', cwd=submodule_path) commits[submodule] = stdout.split()
          else:
+            initial_revs["."] = None
              if os.path.exists(os.path.join(srctree, '.git')):
                  # Check if it's a tree previously extracted by us. This is done

Quoted 1 line
                  # by ensuring that devtool-base and args.branch (devtool) exist.

Why aren't we seeing other reports of this? How is it reproduced?

I checked the devtool OEQA, there' no test case to cover this.

You can see my reproduce step in my commit message.

When I was trying to add an oeqa to this case just now, I found the problem has been fixed by the following commit.

"""

commit 64d5db2f89b4f3712b55127215ae02ce50dd747a
Author: Jamin Lin <[email protected]>
Date:   Wed Jan 3 18:13:44 2024 +0800

    devtool: modify: fix exception

    Root Cause:
    initial_revs is an empty dictionary and do not have "." key.

    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 922, in modify if not initial_revs["."]:
    KeyError: '.'

    Solution:
    check key exists, then get its value.

    (From OE-Core rev: fb0db5c48abb4d56233a175fdd349d18b972e452)

Quoted 7 lines

"""

So my patch can be ignored.

Regards,

Qi

To avoid any regression, I just sent out a patch to add a test case, devtool.DevtoolModifyTests.test_devtool_modify_git_no_extract.

Regards,

Qi

Quoted 22 lines
Quoted 5 lines

Should we be adding an extra test to improve coverage?

I'm assuming this isn't related to:

Quoted 7 lines

https://bugzilla.yoctoproject.org/show_bug.cgi?id=15318

?

Cheers,

Richard

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#194112): https://lists.openembedded.org/g/openembedded-core/message/194112
Mute This Topic: https://lists.openembedded.org/mt/103366660/3618072
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-