made --archive a superset of --force-archive (otherwise it doesn't really make

sense)

git-svn-id: svn://rubyforge.org/var/svn/sup/trunk@202 5c8cc53c-5e98-4d25-b20a-d8db53a31250

diff --git a/bin/sup-import b/bin/sup-import
index 0ac9a5f198b19586c56fdbcb2499a8513e0f1a03..b429b43f94d97c3578e7d0bc876f03f2a4b56673 100644 (file)
--- a/bin/sup-import
+++ b/bin/sup-import
@@ -170,7 +170,7 @@ begin
     start_offset = nil
     source.each do |offset, labels|
       start_offset ||= offset
-      labels -= [:inbox] if force_archive
+      labels -= [:inbox] if force_archive || archive
       labels -= [:unread] if force_read
       begin
         m = Redwood::Message.new :source => source, :source_info => offset, :labels => labels