actually merge the release/v0.2.0 branch!

My life has been a lie until this moment...
I had done:
git merge -s ours release/v0.2.0
to avoid deleting the debian folder...
but that left the src untouched...

Now I just rm'd the src folder and did a
git checkout release/v0.2.0 src/
... and merge happy! :)

1 files changed, 5 insertions, 3 deletions

diff --git a/src/leap/util/coroutines.py b/src/leap/util/coroutines.py
index e7ccfacf..0657fc04 100644
--- a/src/leap/util/coroutines.py
+++ b/src/leap/util/coroutines.py
@@ -4,10 +4,13 @@
 
 from __future__ import division, print_function
 
+import logging
 from subprocess import PIPE, Popen
 import sys
 from threading import Thread
 
+logger = logging.getLogger(__name__)
+
 ON_POSIX = 'posix' in sys.builtin_module_names
 
 
@@ -38,8 +41,7 @@ for each event
             if callable(callback):
                 callback(m)
             else:
-                #XXX log instead
-                print('not a callable passed')
+                logger.debug('not a callable passed')
     except GeneratorExit:
         return
 
@@ -72,7 +74,7 @@ def watch_output(out, observers):
     :type out: fd
     :param observers: tuple of coroutines to send data\
 for each event
-    :type ovservers: tuple
+    :type observers: tuple
     """
     observer_dict = dict(((observer, process_events(observer))
                          for observer in observers))