Merge remote-tracking branch 'origin/integracion' into merge

dioh · dioh · commit 931865fd4bd9 · 2014-04-30T16:47:14.000-03:00
Merging mac os support fixes
diff --git a/faraday b/faraday
@@ -207,7 +207,7 @@ else
 fi
 if [ $faraday_os == Darwin ]; then
 	echo [!] OSX support is limited
-	arch -i386 python main.py $@
+	python main.py $@
 else
 	$faraday_pyver main.py $@
 fi
diff --git a/plugins/core.py b/plugins/core.py
@@ -213,20 +213,19 @@ def processOutput(self, plugin, output):
         output_queue.put(None)
         output_queue.join()
 
-        model.api.devlog("Core: queue size '%s'" % new_elem_queue.qsize())
+        #model.api.devlog("Core: queue size '%s'" % new_elem_queue.qsize())
         while True:
             try:
                 current_action = new_elem_queue.get(block=False)
+                if current_action is None:
+                    break
                 action = current_action[0]
                 parameters = current_action[1:]
                 model.api.devlog("Core: Processing a new '%s' , parameters (%s) \n" % (action,str(parameters)))
                 self._processAction(action, parameters)
 
             except Queue.Empty:
-                if new_elem_queue.qsize() > 0:
-                    continue
-                else:
-                    break
+                continue
             except IOError, e:
                 if e.errno == errno.EINTR:
                     continue
@@ -799,7 +798,6 @@ def run(self):
                         try:
                             self.new_elem_queue.put(self.plugin._pending_actions.get(block=False))
                         except Queue.Empty:
-                            
                             model.api.devlog("PluginProcess run _pending_actions queue Empty. Breaking loop")
                             break
                         except Exception:
@@ -813,5 +811,6 @@ def run(self):
                 model.api.devlog('%s: Exiting' % proc_name)
                 
             self.output_queue.task_done()
+        self.new_elem_queue.put(None)
         return
 
diff --git a/requirements.txt b/requirements.txt
@@ -2,10 +2,10 @@ couchdbkit==0.6.5
 mockito==0.5.1
 whoosh==2.5.5
 argparse==1.1
-psycopg2==2.4.5
+#psycopg2==2.4.5
 ipy==0.75
 restkit==4.2.2
 requests==1.2.3
 tornado==3.2
 Flask==0.10.1
-python-dateutil=2.2
+python-dateutil==2.2
diff --git a/zsh/faraday.zsh b/zsh/faraday.zsh
@@ -18,7 +18,7 @@ add-output() {
     old_cmd=$BUFFER
     new_cmd=`python2 $plugin_controller_client send_cmd $BUFFER`
     BUFFER=" $new_cmd"
-    zle .$WIDGET "$@"
+    zle .accept-line "$@"
 }
 
 function zshaddhistory() {

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ add-output() {`
`18`	`18`	`old_cmd=$BUFFER`
`19`	`19`	new_cmd=`python2 $plugin_controller_client send_cmd $BUFFER`
`20`	`20`	`BUFFER=" $new_cmd"`
`21`		`- zle .$WIDGET "$@"`
	`21`	`+ zle .accept-line "$@"`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`function zshaddhistory() {`