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

This commit is contained in:
2017-03-11 00:06:00 +01:00
2 changed files with 18 additions and 5 deletions

View File

@@ -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))

View File

@@ -548,13 +548,20 @@ 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
if not self.status.has( "sav_err" ) and \
not self.status.has( "note_rej" ):
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
self.status.remove("sav_err")
self.status.remove("note_rej")
self.status.add( "marked" )
def get_disc_link( self ):