From 2ec3e9f72f989d0d22814ae34d0fca2caada26dc Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Fri, 17 Aug 2012 10:35:16 -0400 Subject: [PATCH] cc-4228: removed two subtle bugs where hooks were added wrong and packing and hooking was called in wrong order --- python_apps/media-monitor2/media/monitor/events.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/python_apps/media-monitor2/media/monitor/events.py b/python_apps/media-monitor2/media/monitor/events.py index 10df5e01a..4260e2cc3 100644 --- a/python_apps/media-monitor2/media/monitor/events.py +++ b/python_apps/media-monitor2/media/monitor/events.py @@ -84,8 +84,8 @@ class BaseEvent(Loggable): # pack will only throw an exception if it processes one file but this # is a little bit hacky try: - ret = self.pack() self._pack_hook() + ret = self.pack() return ret except BadSongFile as e: return [e] @@ -95,7 +95,6 @@ class BaseEvent(Loggable): self._raw_event = evt self.path = evt.path self.__class__ = evt.__class__ - self.add_safe_pack_hook(evt._pack_hook) return self class FakePyinotify(object):