From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 18 Oct 2007 19:31:33 +0000 (-0400)
Subject: fis logic stupidity
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/e504bacb221cb290631f57f31fda581fa39ad6f4?ds=sidebyside

fis logic stupidity

This kind of thing is why I shouldn't commit changes before lunch. But do I wait for lunch before committing stupid logic errors? Noo..
---

diff --git a/debian/changelog b/debian/changelog
index ef53f9f..e82b102 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,7 @@ mr (0.4) UNRELEASED; urgency=low
   * Fix a bug caused by a stupid typo.
   * Add the -n switch, for disabling recursion.
 
- -- Joey Hess <joeyh@debian.org>  Thu, 18 Oct 2007 15:18:40 -0400
+ -- Joey Hess <joeyh@debian.org>  Thu, 18 Oct 2007 15:27:01 -0400
 
 mr (0.3) unstable; urgency=low
 
diff --git a/mr b/mr
index 44fb671..707a9a5 100755
--- a/mr
+++ b/mr
@@ -204,7 +204,7 @@ A few parameters have special meanings:
 
 =item skip
 
-If the "skip" parameter is set and its command returns nonzero, then B<mr>
+If the "skip" parameter is set and its command returns true, then B<mr>
 will skip acting on that repository. The command is passed the action
 name in $1.
 
@@ -218,13 +218,13 @@ been at least 12 hours since the last update.
 
 =item chain
 
-If the "chain" parameter is set and its command returns nonzero, then B<mr>
+If the "chain" parameter is set and its command returns true, then B<mr>
 will try to load a .mrconfig file from the root of the repository. (You
 should avoid chaining from repositories with untrusted committers.)
 
 =item deleted
 
-If the "deleted" parameter is set and its command returns nonzero, then
+If the "deleted" parameter is set and its command returns true, then
 B<mr> will treat the repository as deleted. It won't ever actually delete
 the repository, but it will warn if it sees the repository's directory.
 This is useful when one mrconfig file is shared amoung multiple machines,
@@ -419,11 +419,11 @@ sub action { #{{{
 				elsif ($? & 127) {
 					print STDERR "mr $action: deleted test received signal ".($? & 127)."\n";
 				}
-				if ($ret >> 8 == 0) {
-					print STDERR "mr error: $dir should be deleted yet still exists\n\n";
-					push @failed, $dir;
-					return;
-				}
+			}
+			if ($ret >> 8 == 0) {
+				print STDERR "mr error: $dir should be deleted yet still exists\n\n";
+				push @failed, $dir;
+				return;
 			}
 		}
 	}
@@ -464,11 +464,11 @@ sub action { #{{{
 				print STDERR "mr $action: skip test received signal ".($? & 127)."\n";
 				exit 1;
 			}
-			if ($ret >> 8 == 0) {
-				print "mr $action: $dir skipped per config file\n" if $verbose;
-				push @skipped, $dir;
-				return;
-			}
+		}
+		if ($ret >> 8 == 0) {
+			print "mr $action: $dir skipped per config file\n" if $verbose;
+			push @skipped, $dir;
+			return;
 		}
 	}