Merge branch 'master' into xapian

1 files changed, 2 insertions, 2 deletions

diff --git a/ikiwiki-mass-rebuild b/ikiwiki-mass-rebuild
index b40eb0b3b..3d0ca734c 100755
--- a/ikiwiki-mass-rebuild
+++ b/ikiwiki-mass-rebuild
@@ -33,9 +33,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));
+		my $grouplist=join(" ", $ugid, sort {$a <=> $b} $ugid, supplemental_groups($user));
 		if (($)=$grouplist) ne $grouplist) {
-			die "failed to set egid $grouplist: $!";
+			die "failed to set egid $grouplist (got back $))";
 		}
 		$(=$ugid;
 		$<=$uuid;