summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharlie Wu <chiachiwu@google.com>2023-06-13 12:56:18 +0000
committerSteve Sakoman <steve@sakoman.com>2023-07-04 05:32:29 -1000
commit593a3d775fb97d14de93248ad440bd35eece8842 (patch)
tree74d27af62afc4681693e6daf561a89523ec4f33c
parentbeb7517072678dfc30e2255c41f7dc4b66aae203 (diff)
downloadpoky-593a3d775fb97d14de93248ad440bd35eece8842.tar.gz
devtool: Fix the wrong variable in srcuri_entry
devtool crashes when running "update-recipe" and append changes on the recipe. "$ devtool update-recipe -a <layer> <recipe>" Traceback (most recent call last): ... File "/ovss/ovss_quanta/poky/scripts/lib/devtool/standard.py", line 1636, in srcuri_entry return 'file://%s%s' % (basepath, paramstr) ^^^^^^^^ NameError: cannot access free variable 'basepath' where it is not associated with a value in enclosing scope The input variable 'fname' should have the same meaning as the variable 'basepath'. Modify the 'fname' to 'basepath' and solve the issue. (From OE-Core rev: 6e9d2bfed4bb1a02b9ad023cb70cef90366f8233) Signed-off-by: Charlie Wu <chiachiwu@google.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> (cherry picked from commit c3231756bbc2cb5641204414ad3670d7f8607ed3) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--scripts/lib/devtool/standard.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 0339d12763..abf80e2f31 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -1629,7 +1629,7 @@ def _update_recipe_patch(recipename, workspace, srctree, rd, appendlayerdir, wil
1629 else: 1629 else:
1630 patchdir_params = {'patchdir': relpatchdir} 1630 patchdir_params = {'patchdir': relpatchdir}
1631 1631
1632 def srcuri_entry(fname): 1632 def srcuri_entry(basepath):
1633 if patchdir_params: 1633 if patchdir_params:
1634 paramstr = ';' + ';'.join('%s=%s' % (k,v) for k,v in patchdir_params.items()) 1634 paramstr = ';' + ';'.join('%s=%s' % (k,v) for k,v in patchdir_params.items())
1635 else: 1635 else: