From: Adam Sampson <ats@offog.org>
Date: Tue, 10 Oct 2006 21:09:34 +0000 (+0000)
Subject: Resolve conflict
X-Git-Tag: v2.12rc1~8
X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=26ece07784e23752b6c6e863b936b0136591511a;p=rawdog%2F.git

Resolve conflict
---

diff --git a/rawdoglib/rawdog.py b/rawdoglib/rawdog.py
index 9e297b7..c8bd496 100644
--- a/rawdoglib/rawdog.py
+++ b/rawdoglib/rawdog.py
@@ -1132,6 +1132,7 @@ class Rawdog(Persistable):
 					del articles[key]
 					continue
 				if (seen_some_items.has_key(url)
+				    and self.feeds.has_key(url)
 				    and article.can_expire(now, config)
 				    and feedcounts[url] > self.feeds[url].get_keepmin(config)):
 					plugins.call_hook("article_expired", self, config, article, now)
@@ -1170,17 +1171,10 @@ class Rawdog(Persistable):
 				do_expiry(articles)
 				save_persisted(persister, config)
 
-		count = 0
-		for key, article in self.articles.items():
-			url = article.feed
-			if (seen_some_items.has_key(url)
-			    and article.can_expire(now, config)
-			    and feedcounts[url] > self.feeds[url].get_keepmin(config)):
-				plugins.call_hook("article_expired", self, config, article, now)
-				count += 1
-				feedcounts[url] -= 1
-				del self.articles[key]
-		config.log("Expired ", count, " articles, leaving ", len(self.articles))
+		if config["splitstate"]:
+			self.articles = {}
+		else:
+			do_expiry(self.articles)
 
 		self.modified()
 		config.log("Finished update")