aboutsummaryrefslogtreecommitdiffstats
path: root/meta
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-17 11:32:20 +0000
commitacc17ef91a6f506e3cacdc0d4ebfa268b3f3affd (patch)
treeacc6bc696538b5322005dc2f7262c142812e7ced /meta
parent3149319ad997379a01d87f2b1b5d14f66541997f (diff)
downloadopenembedded-core-contrib-acc17ef91a6f506e3cacdc0d4ebfa268b3f3affd.tar.gz
openembedded-core-contrib-acc17ef91a6f506e3cacdc0d4ebfa268b3f3affd.tar.bz2
openembedded-core-contrib-acc17ef91a6f506e3cacdc0d4ebfa268b3f3affd.zip
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. Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 4e0ab1bf84d..a9b506d05df 100644
--- a/meta/classes/useradd-staticids.bbclass
+++ b/meta/classes/useradd-staticids.bbclass
@@ -152,7 +152,7 @@ def update_useradd_static_config(d):
if newgroup:
groupadd = d.getVar("GROUPADD_PARAM_%s" % pkg, True)
if groupadd:
- d.setVar("GROUPADD_PARAM_%s" % pkg, "%s ; %s" % (groupadd, newgroup))
+ d.setVar("GROUPADD_PARAM_%s" % pkg, "%s; %s" % (groupadd, newgroup))
else:
d.setVar("GROUPADD_PARAM_%s" % pkg, newgroup)
@@ -191,7 +191,7 @@ def update_useradd_static_config(d):
newparams.append(newparam)
- return " ;".join(newparams).strip()
+ return ";".join(newparams).strip()
# We parse and rewrite the groupadd components
def rewrite_groupadd(params):
@@ -269,7 +269,7 @@ def update_useradd_static_config(d):
newparams.append(newparam)
- return " ;".join(newparams).strip()
+ return ";".join(newparams).strip()
# Load and process the users and groups, rewriting the adduser/addgroup params
useradd_packages = d.getVar('USERADD_PACKAGES', True)