From 6a392a153454c1395b4a9edc2ccaf9dfe76be1c3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stefan=20K=C3=B6gl?= Date: Sat, 18 May 2013 18:29:25 +0200 Subject: [PATCH] re-order steps of merging podcasts --- mygpo/maintenance/merge.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mygpo/maintenance/merge.py b/mygpo/maintenance/merge.py index ec3b79ab..3509c4ee 100644 --- a/mygpo/maintenance/merge.py +++ b/mygpo/maintenance/merge.py @@ -39,10 +39,9 @@ class PodcastMerger(object): podcast1 = self.podcasts.pop(0) for podcast2 in self.podcasts: - self._merge_objs(podcast1=podcast1, podcast2=podcast2) self.merge_states(podcast1, podcast2) - self.merge_episodes() self.reassign_episodes(podcast1, podcast2) + self._merge_objs(podcast1=podcast1, podcast2=podcast2) delete_podcast(podcast2) self.actions['merge-podcast'] += 1 -- 2.11.4.GIT