sup-tweak-labels in sup-0.22.0

- old
+ new

@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
 
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
-require 'rubygems'
 require 'trollop'
 require "sup"
 
 class Float
   def to_s; sprintf '%.2f', self; end
@@ -81,10 +80,10 @@
   if add_labels.empty?
     ## if all we're doing is removing labels, we can further restrict the
     ## query to only messages with those labels
     query += " (" + remove_labels.map { |l| "label:#{l}" }.join(" OR ") + ")"
   end
-  query += ' ' + opts[:query] if opts[:query]
+  query += ' AND ' + opts[:query] if opts[:query]
 
   parsed_query = index.parse_query query
   parsed_query.merge! :load_spam => true, :load_deleted => true, :load_killed => true
   ids = index.to_enum(:each_id, parsed_query)
   num_total = index.num_results_for parsed_query