public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correcting typo in dupe feed resolution.

Browse source
This commit is contained in:
Samuel Clay 2012-02-09 07:50:40 -08:00
parent 1c4a5c975e
commit 9236ecc6f6
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/rss_feeds/models.py
View file

@ -145,7 +145,7 @@ class Feed(models.Model):
duplicate_feed = Feed.objects.filter(feed_address=self.feed_address, feed_link=self.feed_link)
logging.debug("%s: %s" % (self.feed_address, duplicate_feed))
logging.debug(' ***> [%-30s] Feed deleted. Could not save: %s' % (unicode(self)[:30], e))
if duplicate_feeds:
if duplicate_feed:
merge_feeds(self.pk, duplicate_feed[0].pk)
return duplicate_feed[0]
# Feed has been deleted. Just ignore it.

1
fabfile.py vendored
View file

@ -81,7 +81,6 @@ def deploy():
post_deploy()
def deploy_full():
pre_deploy()
deploy_code(full=True)
post_deploy()