summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorMax Kellermann <max.kellermann@gmail.com>2019-03-07 14:04:00 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-20 14:38:16 +0100
commit92dd0b2d9d202cc5863c178a32954924431de5d5 (patch)
treeaf6955e8ea33ac6b99b4916978cf19e0838fbef5 /meta/classes
parent7af49cc6b04d653e3775230172d6dc3c349de123 (diff)
downloadpoky-92dd0b2d9d202cc5863c178a32954924431de5d5.tar.gz
useradd-staticids: print exception after parse_args() error
Without this, the user has no idea what went wrong. (From OE-Core rev: b1a5713b8746e4aa8fdc5e0122a30ebdc637b4dd) Signed-off-by: Max Kellermann <max.kellermann@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/useradd-staticids.bbclass8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/useradd-staticids.bbclass b/meta/classes/useradd-staticids.bbclass
index 70d59e5573..3a1b5f1320 100644
--- a/meta/classes/useradd-staticids.bbclass
+++ b/meta/classes/useradd-staticids.bbclass
@@ -76,8 +76,8 @@ def update_useradd_static_config(d):
76 for param in oe.useradd.split_commands(params): 76 for param in oe.useradd.split_commands(params):
77 try: 77 try:
78 uaargs = parser.parse_args(oe.useradd.split_args(param)) 78 uaargs = parser.parse_args(oe.useradd.split_args(param))
79 except: 79 except Exception as e:
80 bb.fatal("%s: Unable to parse arguments for USERADD_PARAM_%s: '%s'" % (d.getVar('PN'), pkg, param)) 80 bb.fatal("%s: Unable to parse arguments for USERADD_PARAM_%s '%s': %s" % (d.getVar('PN'), pkg, param, e))
81 81
82 # Read all passwd files specified in USERADD_UID_TABLES or files/passwd 82 # Read all passwd files specified in USERADD_UID_TABLES or files/passwd
83 # Use the standard passwd layout: 83 # Use the standard passwd layout:
@@ -197,8 +197,8 @@ def update_useradd_static_config(d):
197 try: 197 try:
198 # If we're processing multiple lines, we could have left over values here... 198 # If we're processing multiple lines, we could have left over values here...
199 gaargs = parser.parse_args(oe.useradd.split_args(param)) 199 gaargs = parser.parse_args(oe.useradd.split_args(param))
200 except: 200 except Exception as e:
201 bb.fatal("%s: Unable to parse arguments for GROUPADD_PARAM_%s: '%s'" % (d.getVar('PN'), pkg, param)) 201 bb.fatal("%s: Unable to parse arguments for GROUPADD_PARAM_%s '%s': %s" % (d.getVar('PN'), pkg, param, e))
202 202
203 # Read all group files specified in USERADD_GID_TABLES or files/group 203 # Read all group files specified in USERADD_GID_TABLES or files/group
204 # Use the standard group layout: 204 # Use the standard group layout: