]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commitdiff
devtool: Fix the wrong variable in srcuri_entry
authorCharlie Wu <chiachiwu@google.com>
Tue, 13 Jun 2023 12:56:18 +0000 (12:56 +0000)
committerSteve Sakoman <steve@sakoman.com>
Wed, 5 Jul 2023 16:44:52 +0000 (06:44 -1000)
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.

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>
scripts/lib/devtool/standard.py

index e2a8335a6266315787f72341a7fe21a94437004b..7a005c901068fb28e14af1212a1bd699d60f2c61 100644 (file)
@@ -1628,7 +1628,7 @@ def _update_recipe_patch(recipename, workspace, srctree, rd, appendlayerdir, wil
     else:
         patchdir_params = {'patchdir': relpatchdir}
 
-    def srcuri_entry(fname):
+    def srcuri_entry(basepath):
         if patchdir_params:
             paramstr = ';' + ';'.join('%s=%s' % (k,v) for k,v in patchdir_params.items())
         else: