From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 26 Feb 2018 06:10:32 +0000 (+0100)
Subject: scripts/metadata.pm: allow group-only Require-User specs
X-Git-Tag: v18.06.0-rc1~777
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=884c9575e1c6ac4f53a313c99f3e65a2efa77bd1;p=oweals%2Fopenwrt.git

scripts/metadata.pm: allow group-only Require-User specs

/lib/functions.sh can deal with Require-User specifications that only
contain a group, but no user. Adjust metadata.pm to allow such
specifications as well.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
---

diff --git a/scripts/metadata.pm b/scripts/metadata.pm
index ea38735389..e05e400991 100644
--- a/scripts/metadata.pm
+++ b/scripts/metadata.pm
@@ -283,8 +283,10 @@ sub parse_package_metadata($) {
 
 			for my $ugspec (@ugspecs) {
 				my @ugspec = split /:/, $ugspec, 2;
-				parse_package_metadata_usergroup($src->{makefile}, "user", \%usernames, \%userids, $ugspec[0]) or return 0;
-				if (@ugspec > 1) {
+				if ($ugspec[0]) {
+					parse_package_metadata_usergroup($src->{makefile}, "user", \%usernames, \%userids, $ugspec[0]) or return 0;
+				}
+				if ($ugspec[1]) {
 					parse_package_metadata_usergroup($src->{makefile}, "group", \%groupnames, \%groupids, $ugspec[1]) or return 0;
 				}
 			}