Change 29546 by [EMAIL PROTECTED] on 2006/12/13 10:40:36
Subject: [PATCH] t/op/groups.t: prevent failure on modern FreeBSDs
From: Anton Berezin <[EMAIL PROTECTED]>
Date: Tue, 12 Dec 2006 19:59:38 +0100
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/perl/t/op/groups.t#32 edit
Differences ...
==== //depot/perl/t/op/groups.t#32 (xtext) ====
Index: perl/t/op/groups.t
--- perl/t/op/groups.t#31~25140~ 2005-07-13 10:22:07.000000000 -0700
+++ perl/t/op/groups.t 2006-12-13 02:40:36.000000000 -0800
@@ -56,6 +56,8 @@
if (($groups = `id -a 2>/dev/null`) ne '') {
# $groups is of the form:
# uid=39957(gsar) gid=22(users)
groups=33536,39181,22(users),0(root),1067(dev)
+ # FreeBSD since 6.2 has a fake id -a:
+ # uid=1001(tobez) gid=20(staff) groups=20(staff), 0(wheel), 68(dialer)
last GROUPS if $groups =~ /groups=/;
}
if (($groups = `id -Gn 2>/dev/null`) ne '') {
@@ -90,7 +92,7 @@
# That is: do not \w, do not \S.
if ($groups =~ /groups=(.+)( [ug]id=|$)/) {
my $gr = $1;
- my @g0 = split /,/, $gr;
+ my @g0 = split /, ?/, $gr;
my @g1;
# prefer names over numbers
for (@g0) {
End of Patch.