Merge commit 'upstream/master'

[git.ikiwiki.info.git] / ikiwiki-mass-rebuild

diff --git a/ikiwiki-mass-rebuild b/ikiwiki-mass-rebuild
index 8cc6f45c1d9f6fbd21b40e403bc3d5561bb93d3e..f13033e7f821d7cbae3a7c761147aa27dedf2b45 100755 (executable)
--- a/ikiwiki-mass-rebuild
+++ b/ikiwiki-mass-rebuild
@@ -15,6 +15,23 @@ sub supplemental_groups {
        return @list;
 }
 
+sub samelists {
+       my %a=map { $_ => 1 } split(' ', shift());
+       my %b=map { $_ => 1 } split(' ', shift());
+
+       foreach my $i (keys %b) {
+               if (! exists $a{$i}) {
+                       return 0;
+               }
+       }
+       foreach my $i (keys %a) {
+               if (! exists $b{$i}) {
+                       return 0;
+               }
+       }
+       return 1;
+}
+
 sub processline {
        my $user=shift;
        my $setup=shift;
@@ -33,10 +50,9 @@ sub processline {
        defined(my $pid = fork) or die "Can’t fork: $!";
        if (! $pid) {
                my ($uuid, $ugid) = (getpwnam($user))[2, 3];
-               my $grouplist=join(" ", $ugid, $ugid, supplemental_groups($user));
-               $)=$grouplist;
-               if ($!) {
-                       die "failed to set egid $grouplist: $!";
+               my $grouplist=join(" ", $ugid, sort {$a <=> $b} $ugid, supplemental_groups($user));
+               if (! samelists(($)=$grouplist), $grouplist)) {
+                       die "failed to set egid $grouplist (got back $))";
                }
                $(=$ugid;
                $<=$uuid;