public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-31 21:41:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Updating stories which give integrity errors."

Browse source 
This reverts commit 98c4b2c7a0.

Conflicts:
	apps/rss_feeds/models.py
This commit is contained in:
Samuel Clay 2013-11-17 14:34:30 -08:00
parent 348a45e2de
commit 69b9f1cf45
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/rss_feeds/models.py
View file

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