run skip test before chdir

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 470927afa04094d00d1a5a61f64db4bc11906f20..5c9d6a3a969640c8c73110f610ec61400bb04063 100755 (executable)
--- a/mr
+++ b/mr
@@ -298,10 +298,6 @@ sub action {
        }
        
        $ENV{MR_REPO}=$dir;
-       if (! $nochdir && ! chdir($dir)) {
-               print STDERR "mr $action: failed to chdir to $dir: $!\n";
-               push @skipped, $dir;
-       }
 
        if (exists $config{$topdir}{$subdir}{skip}) {
                my $test="set -e;".$lib.$config{$topdir}{$subdir}{skip};
@@ -313,8 +309,12 @@ sub action {
                        return;
                }
        }
-
-       if (! exists $config{$topdir}{$subdir}{$action}) {
+       
+       if (! $nochdir && ! chdir($dir)) {
+               print STDERR "mr $action: failed to chdir to $dir: $!\n";
+               push @failed, $dir;
+       }
+       elsif (! exists $config{$topdir}{$subdir}{$action}) {
                print STDERR "mr $action: no defined $action command for $topdir$subdir, skipping\n";
                push @skipped, $dir;
        }