commit 5bf815cacd0bd5b5b3b5e42a85fed9b03326269a
parent 392847a8e0abba1887ca76e24666eca7492507bd
Author: William Morgan <wmorgan-sup@masanjin.net>
Date: Mon, 18 May 2009 11:21:22 -0400
Merge branch 'master' into next
Diffstat:
9 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/sup b/bin/sup
diff --git a/bin/sup-add b/bin/sup-add
diff --git a/bin/sup-config b/bin/sup-config
diff --git a/bin/sup-dump b/bin/sup-dump
diff --git a/bin/sup-recover-sources b/bin/sup-recover-sources
diff --git a/bin/sup-sync b/bin/sup-sync
diff --git a/bin/sup-sync-back b/bin/sup-sync-back
diff --git a/bin/sup-tweak-labels b/bin/sup-tweak-labels
diff --git a/lib/sup/index.rb b/lib/sup/index.rb
@@ -553,7 +553,7 @@ protected
subs = subs.gsub(/\b(before|on|in|during|after):(\((.+?)\)\B|(\S+)\b)/) do
break if chronic_failure
field, datestr = $1, ($3 || $4)
- realdate = Chronic.parse(datestr, :guess => false, :context => :none)
+ realdate = Chronic.parse(datestr, :guess => false, :context => :past)
if realdate
case field
when "after"