Fix some references that missed during the overrides syntax migration or
were incorrect. Thanks to Quentin Schulz <foss@...> for the patch.
Signed-off-by: Richard Purdie <richard.purdie@...>
---
lib/bb/fetch2/__init__.py | 2 +-
lib/bb/tests/parse.py | 2 +-
lib/bb/utils.py | 2 +-
lib/toaster/toastergui/views.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py
index 60aaf3902a..ad898680ff 100644
--- a/lib/bb/fetch2/__init__.py
+++ b/lib/bb/fetch2/__init__.py
@@ -1146,7 +1146,7 @@ def srcrev_internal_helper(ud, d, name):
pn = d.getVar("PN")
attempts = []
if name != '' and pn:
- attempts.append("SRCREV_%s_pn-%s" % (name, pn))
+ attempts.append("SRCREV_%s:pn-%s" % (name, pn))
if name != '':
attempts.append("SRCREV_%s" % name)
if pn:
diff --git a/lib/bb/tests/parse.py b/lib/bb/tests/parse.py
index 1b6b6d412e..4d17f82edc 100644
--- a/lib/bb/tests/parse.py
+++ b/lib/bb/tests/parse.py
@@ -99,7 +99,7 @@ exportD = "d"
overridetest = """
RRECOMMENDS:${PN} = "a"
-RRECOMMENDS:${PN}_libc = "b"
+RRECOMMENDS:${PN}:libc = "b"
OVERRIDES = "libc:${PN}"
PN = "gtk+"
"""
diff --git a/lib/bb/utils.py b/lib/bb/utils.py
index 6ba1d2a376..e6e82d1118 100644
--- a/lib/bb/utils.py
+++ b/lib/bb/utils.py
@@ -1178,7 +1178,7 @@ def edit_metadata(meta_lines, variables, varfunc, match_overrides=False):
variables: a list of variable names to look for. Functions
may also be specified, but must be specified with '()' at
the end of the name. Note that the function doesn't have
- any intrinsic understanding of _append, _prepend, _remove,
+ any intrinsic understanding of :append, :prepend, :remove,
or overrides, so these are considered as part of the name.
These values go into a regular expression, so regular
expression syntax is allowed.
diff --git a/lib/toaster/toastergui/views.py b/lib/toaster/toastergui/views.py
index 04ab8bcb04..74f9d56963 100644
--- a/lib/toaster/toastergui/views.py
+++ b/lib/toaster/toastergui/views.py
@@ -1840,7 +1840,7 @@ if True:
pass
try:
context['image_install:append'] = ProjectVariable.objects.get(project = prj, name = "IMAGE_INSTALL:append").value
- context['image_install:append_defined'] = "1"
+ context['image_install_append_defined'] = "1"
except ProjectVariable.DoesNotExist:
pass
try:
--
2.30.2
