[PATCHv2 6/6] useradd-staticids.bbclass: Remove unnecessary spaces

Peter Kjellerstedt
2015-12-18T23:54:06Z

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>
---
meta/classes/useradd-staticids.bbclass | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/classes/useradd-staticids.bbclass b/meta/classes/useradd-staticids.bbclass
index 4e0ab1b..a9b506d 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)
--
2.1.0