Merge branches 'develop' and 'tv' of https://github.com/RuudBurger/CouchPotatoServer into tv

Conflicts: couchpotato/core/plugins/renamer/main.py
2013-12-14 23:43:29 +01:00
parent 8adf7fc600 3b0e07100f
commit 2a76de50dd
15 changed files with 236 additions and 217 deletions
@@ -288,7 +288,7 @@ class Release(Plugin):
                                    value = toUnicode(download_result.get(key))
                                )
                                rls.info.append(rls_info)
-                        db.commit()
+                            db.commit()

                        log_movie = '%s (%s) in %s' % (getTitle(media['library']), media['library']['year'], rls.quality.label)
                        snatch_message = 'Snatched "%s": %s' % (data.get('name'), log_movie)