Merge branch 'master' into debian-jessie-backports

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

diff --git a/ikiwiki-mass-rebuild b/ikiwiki-mass-rebuild
index bbef4946bb5b76d4aa6f5a291b253ada42309529..06a9b512b42ca8afc176ad4dfbe7aba8db3506c1 100755 (executable)
--- a/ikiwiki-mass-rebuild
+++ b/ikiwiki-mass-rebuild
@@ -20,7 +20,7 @@ sub processline {
                return;
        }
        print "Processing $setup as user ".username()." ...\n";
                return;
        }
        print "Processing $setup as user ".username()." ...\n";

-       my $ret=system("ikiwiki", "-setup", $setup, @ARGV);
+       my $ret=system("ikiwiki", "--setup", $setup, @ARGV);

        if ($ret != 0) {
                print STDERR "warning: processing $setup failed with code $ret\n";
        }
        if ($ret != 0) {
                print STDERR "warning: processing $setup failed with code $ret\n";
        }


@@ -29,7 +29,7 @@ sub processline {
 my %users;
 sub processuser {
        my $user=shift;
 my %users;
 sub processuser {
        my $user=shift;

-       next if $user=~/^-/ || $users{$user};
+       return if $user=~/^-/ || $users{$user};

        $users{$user}=1;
        my $ret=system("su", $user, "-s", "/bin/sh", "-c", "--", "$0 --nonglobal @ARGV");
        if ($ret != 0) {
        $users{$user}=1;
        my $ret=system("su", $user, "-s", "/bin/sh", "-c", "--", "$0 --nonglobal @ARGV");
        if ($ret != 0) {