Merged

diff --git a/zukebox_server/src/bin/zukebox-server b/zukebox_server/src/bin/zukebox-server
index c63d48f..927c769 100755 (executable)
--- a/zukebox_server/src/bin/zukebox-server
+++ b/zukebox_server/src/bin/zukebox-server
@@ -31,6 +31,7 @@ def get_zbus_service():
     bus_obj = bus.get_object("br.org.zagaia",
             "/br/org/zagaia/ZukeBox")
     bus_iface = dbus.Interface(bus_obj, "br.org.zagaia.ZukeBox")
+    log.debug("zukebox-server.executing rescan audio path...")
     bus_iface.rescan_audio_folder()
 
 def config_dot_zb():

diff --git a/zukebox_server/src/server/zb_server.py b/zukebox_server/src/server/zb_server.py
index efa2778..f8813c6 100644 (file)
--- a/zukebox_server/src/server/zb_server.py
+++ b/zukebox_server/src/server/zb_server.py
@@ -102,7 +102,6 @@ class ZukeBoxServer(ZIface, dbus.service.Object):
 
     @dbus.service.method(DBUS_IFACE)
     def rescan_audio_folder(self):
-        print "rescanning_audio_folder..."
         if not self.cds:
             return
         pm = self.cds.control_controller.plugin_manager