KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
/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>
This commit is contained in:
Matthias Schiffer 2018-02-26 07:10:32 +01:00
parent c5b06da56c
commit 884c9575e1
No known key found for this signature in database
GPG key ID: 16EF3F64CB201D9C
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/metadata.pm
View file

@ -283,8 +283,10 @@ sub parse_package_metadata($) {
for my $ugspec (@ugspecs) { for my $ugspec (@ugspecs) {
my @ugspec = split /:/, $ugspec, 2; my @ugspec = split /:/, $ugspec, 2;
parse_package_metadata_usergroup($src->{makefile}, "user", \%usernames, \%userids, $ugspec[0]) or return 0; if ($ugspec[0]) {
if (@ugspec > 1) { 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; parse_package_metadata_usergroup($src->{makefile}, "group", \%groupnames, \%groupids, $ugspec[1]) or return 0;
} }
} }