From 884c9575e1c6ac4f53a313c99f3e65a2efa77bd1 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 26 Feb 2018 07:10:32 +0100
Subject: [PATCH] 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>
---
scripts/metadata.pm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/scripts/metadata.pm b/scripts/metadata.pm
index ea38735389a..e05e4009916 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;
}
}
--
GitLab