diff --git a/apps/rss_feeds/models.py b/apps/rss_feeds/models.py index bed991a9f..807ef6731 100644 --- a/apps/rss_feeds/models.py +++ b/apps/rss_feeds/models.py @@ -939,18 +939,11 @@ class Feed(models.Model): try: s.save() ret_values['new'] += 1 - except (IntegrityError), e: + except (IntegrityError, OperationError), e: ret_values['error'] += 1 if settings.DEBUG: logging.info(' ---> [%-30s] ~SN~FRIntegrityError on new story: %s - %s' % (self.feed_title[:30], story.get('guid'), e)) - except OperationError, e: - existing_story, _ = MStory.find_story(self.pk, - story.get('guid'), - original_only=True) - story_has_changed = True - replace_story_date = True - - if existing_story and story_has_changed: + elif existing_story and story_has_changed: # update story original_content = None try: