diff options
-rw-r--r-- | bitbake/lib/bb/fetch2/__init__.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/tests/parse.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/utils.py | 2 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastergui/views.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 60aaf3902a..ad898680ff 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py | |||
@@ -1146,7 +1146,7 @@ def srcrev_internal_helper(ud, d, name): | |||
1146 | pn = d.getVar("PN") | 1146 | pn = d.getVar("PN") |
1147 | attempts = [] | 1147 | attempts = [] |
1148 | if name != '' and pn: | 1148 | if name != '' and pn: |
1149 | attempts.append("SRCREV_%s_pn-%s" % (name, pn)) | 1149 | attempts.append("SRCREV_%s:pn-%s" % (name, pn)) |
1150 | if name != '': | 1150 | if name != '': |
1151 | attempts.append("SRCREV_%s" % name) | 1151 | attempts.append("SRCREV_%s" % name) |
1152 | if pn: | 1152 | if pn: |
diff --git a/bitbake/lib/bb/tests/parse.py b/bitbake/lib/bb/tests/parse.py index 1b6b6d412e..4d17f82edc 100644 --- a/bitbake/lib/bb/tests/parse.py +++ b/bitbake/lib/bb/tests/parse.py | |||
@@ -99,7 +99,7 @@ exportD = "d" | |||
99 | 99 | ||
100 | overridetest = """ | 100 | overridetest = """ |
101 | RRECOMMENDS:${PN} = "a" | 101 | RRECOMMENDS:${PN} = "a" |
102 | RRECOMMENDS:${PN}_libc = "b" | 102 | RRECOMMENDS:${PN}:libc = "b" |
103 | OVERRIDES = "libc:${PN}" | 103 | OVERRIDES = "libc:${PN}" |
104 | PN = "gtk+" | 104 | PN = "gtk+" |
105 | """ | 105 | """ |
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py index 6ba1d2a376..e6e82d1118 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py | |||
@@ -1178,7 +1178,7 @@ def edit_metadata(meta_lines, variables, varfunc, match_overrides=False): | |||
1178 | variables: a list of variable names to look for. Functions | 1178 | variables: a list of variable names to look for. Functions |
1179 | may also be specified, but must be specified with '()' at | 1179 | may also be specified, but must be specified with '()' at |
1180 | the end of the name. Note that the function doesn't have | 1180 | the end of the name. Note that the function doesn't have |
1181 | any intrinsic understanding of _append, _prepend, _remove, | 1181 | any intrinsic understanding of :append, :prepend, :remove, |
1182 | or overrides, so these are considered as part of the name. | 1182 | or overrides, so these are considered as part of the name. |
1183 | These values go into a regular expression, so regular | 1183 | These values go into a regular expression, so regular |
1184 | expression syntax is allowed. | 1184 | expression syntax is allowed. |
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 04ab8bcb04..74f9d56963 100644 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py | |||
@@ -1840,7 +1840,7 @@ if True: | |||
1840 | pass | 1840 | pass |
1841 | try: | 1841 | try: |
1842 | context['image_install:append'] = ProjectVariable.objects.get(project = prj, name = "IMAGE_INSTALL:append").value | 1842 | context['image_install:append'] = ProjectVariable.objects.get(project = prj, name = "IMAGE_INSTALL:append").value |
1843 | context['image_install:append_defined'] = "1" | 1843 | context['image_install_append_defined'] = "1" |
1844 | except ProjectVariable.DoesNotExist: | 1844 | except ProjectVariable.DoesNotExist: |
1845 | pass | 1845 | pass |
1846 | try: | 1846 | try: |