Merge branch 'master' into next

[sup] / bin / sup-sync-back

diff --git a/bin/sup-sync-back b/bin/sup-sync-back
index f09ae5b51a35f3a1e71d05c1fc7f050f5fdd0007..56ac4eb51c05545e8879c976fcbf8b9c4d695c65 100755 (executable)
--- a/bin/sup-sync-back
+++ b/bin/sup-sync-back
@@ -16,8 +16,8 @@ def die msg
   exit(-1)
 end
 def has_any_from_source_with_label? index, source, label
-  query = { :source_id => source.id, :label => label, :limit => 1 }
-  not Enumerable::Enumerator.new(index, :each_docid, query).map.empty?
+  query = { :source_id => source.id, :label => label, :limit => 1, :load_spam => true, :load_deleted => true, :load_killed => true }
+  not Enumerable::Enumerator.new(index, :each_id, query).map.empty?
 end
 
 opts = Trollop::options do