Merge branch 'fs#110-markpages-status-problems' into test-v3

bots/markpages.py

@@ -172,6 +172,12 @@ class MarkPagesBot( CurrentPageBot ):  # sets 'current_page' on each treat()
 
         # Status
         if add_ret is None or ( add_ret and save_ret ):
+            self.current_page.redfam.article_remove_status(
+                "note_rej",
+                title=self.current_page.title(withNamespace=False))
+            self.current_page.redfam.article_remove_status(
+                "sav_err",
+                title=self.current_page.title(withNamespace=False))
             self.current_page.redfam.article_add_status(
                 "marked",
                 title=self.current_page.title(withNamespace=False))

lib/redfam.py

@@ -548,14 +548,21 @@ class RedFamWorker( RedFam ):
             if not article:
                 break
 
-            if self.article_has_status( "note_rej", title=article ):
-                self.status.add( "note_rej" )
             if self.article_has_status( "sav_err", title=article ):
                 self.status.add( "sav_err" )
+                return
+            elif self.article_has_status( "note_rej", title=article ):
+                self.status.add( "note_rej" )
+                return
+
+            elif not self.article_has_status("deleted", title=article ) and \
+                    not self.article_has_status("redirect", title=article) and\
+                    not self.article_has_status("marked", title=article):
+                return
 
-        if not self.status.has( "sav_err" ) and \
-                not self.status.has( "note_rej" ):
-            self.status.add( "marked" )
+        self.status.remove("sav_err")
+        self.status.remove("note_rej")
+        self.status.add( "marked" )
 
     def get_disc_link( self ):
         """