Fix the hours_since function built into mr's shell library to not exit, but return...

diff --git a/debian/changelog b/debian/changelog
index 2b5ca5bafc4502102737d432186c84b2cdfccbb4..62cef2ae23c804fac49d5fc4b471f4c21e5b02bf 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mr (0.48) unstable; urgency=low
+
+  * Fix the hours_since function built into mr's shell library to
+    not exit, but return a true/false exit status. This allows it to be
+    used outside of skip tests.
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 05 Feb 2010 17:12:01 -0500
+
 mr (0.47) unstable; urgency=low
 
   * Pass -L to curl to allow it to follow redirects when bootstrapping.

diff --git a/mr b/mr
index 7224a04ed2e170626436a89c9056e34c158ab0ff..1f01803da02f86bf0f4a48c415f15845636bd080 100755 (executable)
--- a/mr
+++ b/mr
@@ -1547,10 +1547,10 @@ lib =
                fi
                delta=`perl -wle 'print -f shift() ? int((-M _) * 24) : 9999' "$flagfile"`
                if [ "$delta" -lt "$2" ]; then
-                       exit 0
+                       return 1
                else
                        touch "$flagfile"
-                       exit 1
+                       return 0
                fi
        }