summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2015-12-19 00:53:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-18 11:47:07 +0000
commit4b4dea75b59e281bc023a1974f41124464edc022 (patch)
tree987646f34f62485917449a06bad0dc8e6db1b830 /meta/classes
parent4f2c3525807f79d4e264d39bb70e0b8e4096355b (diff)
downloadpoky-4b4dea75b59e281bc023a1974f41124464edc022.tar.gz
useradd-staticids.bbclass: Remove unnecessary spaces
This removes unnecessary spaces inserted before semicolons in the modified USERADD_PARAM_${PN} and GROUPADD_PARAM_${PN} variables. This should not affect the handling of the variables as the only one that actually sees the semicolons is the code in useradd.bbclass that uses cut to split the variables at them, and any whitespace preceeding or following the semicolons will be properly ignored. (From OE-Core rev: acc17ef91a6f506e3cacdc0d4ebfa268b3f3affd) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/useradd-staticids.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/useradd-staticids.bbclass b/meta/classes/useradd-staticids.bbclass
index 4e0ab1bf84..a9b506d05d 100644
--- a/meta/classes/useradd-staticids.bbclass
+++ b/meta/classes/useradd-staticids.bbclass
@@ -152,7 +152,7 @@ def update_useradd_static_config(d):
152 if newgroup: 152 if newgroup:
153 groupadd = d.getVar("GROUPADD_PARAM_%s" % pkg, True) 153 groupadd = d.getVar("GROUPADD_PARAM_%s" % pkg, True)
154 if groupadd: 154 if groupadd:
155 d.setVar("GROUPADD_PARAM_%s" % pkg, "%s ; %s" % (groupadd, newgroup)) 155 d.setVar("GROUPADD_PARAM_%s" % pkg, "%s; %s" % (groupadd, newgroup))
156 else: 156 else:
157 d.setVar("GROUPADD_PARAM_%s" % pkg, newgroup) 157 d.setVar("GROUPADD_PARAM_%s" % pkg, newgroup)
158 158
@@ -191,7 +191,7 @@ def update_useradd_static_config(d):
191 191
192 newparams.append(newparam) 192 newparams.append(newparam)
193 193
194 return " ;".join(newparams).strip() 194 return ";".join(newparams).strip()
195 195
196 # We parse and rewrite the groupadd components 196 # We parse and rewrite the groupadd components
197 def rewrite_groupadd(params): 197 def rewrite_groupadd(params):
@@ -269,7 +269,7 @@ def update_useradd_static_config(d):
269 269
270 newparams.append(newparam) 270 newparams.append(newparam)
271 271
272 return " ;".join(newparams).strip() 272 return ";".join(newparams).strip()
273 273
274 # Load and process the users and groups, rewriting the adduser/addgroup params 274 # Load and process the users and groups, rewriting the adduser/addgroup params
275 useradd_packages = d.getVar('USERADD_PACKAGES', True) 275 useradd_packages = d.getVar('USERADD_PACKAGES', True)