sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Peter Kjellerstedt 2015-12-19 00:53:52 +01:00 committed by Richard Purdie
parent 4f2c352580
commit 4b4dea75b5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta/classes/useradd-staticids.bbclass
View File

@ -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)