From 259a3eb79204620505c6c21a9ca3602273eb9020 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Mon, 10 Sep 2012 14:51:29 -0400 Subject: [PATCH] cc-4359: normpath'd music dir before passing it to manager.py to remove watch --- python_apps/media-monitor2/media/monitor/airtime.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python_apps/media-monitor2/media/monitor/airtime.py b/python_apps/media-monitor2/media/monitor/airtime.py index eba1f76e4..208556f71 100644 --- a/python_apps/media-monitor2/media/monitor/airtime.py +++ b/python_apps/media-monitor2/media/monitor/airtime.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from kombu.messaging import Exchange, Queue, Consumer from kombu.connection import BrokerConnection +from os.path import normpath import json import os @@ -133,7 +134,7 @@ class AirtimeMessageReceiver(Loggable): def remove_watch(self, msg): self.logger.info("Removing watch from directory: '%s'" % msg['directory']) - self.manager.remove_watch_directory(msg['directory']) + self.manager.remove_watch_directory(normpath(msg['directory'])) def rescan_watch(self, msg): self.logger.info("Trying to rescan watched directory: '%s'" %