minor updates

diff --git a/mr b/mr
index d48fd618a5808b3d17bcca3d207824708262fee2..2a439069b0e914dd8d995ab6b05fc84750d9842c 100755 (executable)
--- a/mr
+++ b/mr
@@ -149,7 +149,7 @@ loadconfig($config);
 #use Data::Dumper;
 #print Dumper(\%config);
 
 #use Data::Dumper;
 #print Dumper(\%config);
 

-my (@failures, @successes, @skipped);
+my (@failed, @successful, @skipped);

 my $first=1;
 foreach my $topdir (sort keys %config) {
        foreach my $subdir (sort keys %{$config{$topdir}}) {
 my $first=1;
 foreach my $topdir (sort keys %config) {
        foreach my $subdir (sort keys %{$config{$topdir}}) {


@@ -213,7 +213,7 @@ sub action {
                my $ret=system($command);
                if ($ret != 0) {
                        print STDERR "mr $action: failed to run: $command\n" if $verbose;
                my $ret=system($command);
                if ($ret != 0) {
                        print STDERR "mr $action: failed to run: $command\n" if $verbose;

-                       push @failures, $topdir.$subdir;
+                       push @failed, $topdir.$subdir;

                        if ($ret >> 8 != 0) {
                                print STDERR "mr $action: command failed\n";
                        }
                        if ($ret >> 8 != 0) {
                                print STDERR "mr $action: command failed\n";
                        }


@@ -222,7 +222,7 @@ sub action {
                        }
                }
                else {
                        }
                }
                else {

-                       push @successes, $dir;
+                       push @successful, $dir;

                }
        }
 }
                }
        }
 }


@@ -237,11 +237,11 @@ sub showstat {
        return;
 }
 print "\nmr $action: finished (".join("; ",
        return;
 }
 print "\nmr $action: finished (".join("; ",

-       showstat($#successes+1, "success", "successes"),
-       showstat($#failures+1, "failure", "failures"),
+       showstat($#successful+1, "successful", "successful"),
+       showstat($#failed+1, "failed", "failed"),

        showstat($#skipped+1, "skipped", "skipped"),
 ).")\n";
        showstat($#skipped+1, "skipped", "skipped"),
 ).")\n";

-exit @failures ? 1 : 0;
+exit @failed ? 1 : 0;

 
 my %loaded;
 sub loadconfig {
 
 my %loaded;
 sub loadconfig {

diff --git a/mrconfig b/mrconfig
index d1e7a460dbaff2140284cb3b7224bc2500884356..44d6d8ea01b534d538aa49f6aeca1db9a97ceaff 100644 (file)
--- a/mrconfig
+++ b/mrconfig
@@ -16,6 +16,7 @@ checkout = git clone git://git.debian.org/git/dpkg/dpkg.git && \
        git fetch kite && \
        git checkout -b sourcev3 kite/sourcev3
 update = git pull origin master && git pull kite sourcev3
        git fetch kite && \
        git checkout -b sourcev3 kite/sourcev3
 update = git pull origin master && git pull kite sourcev3

+commit = git push kite

 
 # My home directory, which I keep in svn.
 []
 
 # My home directory, which I keep in svn.
 []