add try import ldap and psutils

appconftest/bash/yunohost

@@ -1,33 +1,4 @@
-# yuno-repo(1) completion
+#!/bin/sh
 
-_yunohost()
+cd /usr/share/pyshared/yunohost/
-{
+python parse_args $@
-local argc cur prev opts
-COMPREPLY=()
-
-argc=${COMP_CWORD}
-cur="${COMP_WORDS[argc]}"
-prev="${COMP_WORDS[argc-1]}" 
-opts=$(yunohost2 -h | grep usage | awk -F"{" '{print $2}' | awk -F"}" '{print $1}' | tr ',' ' ')
-
-if [[ $argc = 1 ]];
-then
-	COMPREPLY=( $(compgen -W "$opts --help" -- $cur ) )
-fi
-	
-if [[ "$prev" != "--help" ]];
-then
-	if [[ $argc = 2 ]];
-	then
-		opts2=$(yunohost2 $prev -h | grep usage | awk -F"{" '{print $2}' | awk -F"}" '{print $1}' | tr ',' ' ')
-		COMPREPLY=( $(compgen -W "$opts2 --help" -- $cur ) )
-	elif [[ $argc = 3 ]];
-	then
-        	COMPREPLY=( $(compgen -W "--help" $cur ) )
-	fi
-else 
-	COMPREPLY=()
-fi
-
-}
-complete -F _yunohost yunohost

appconftest/bash/yunohost_cli

@@ -0,0 +1,33 @@
+# yunohost(1) completion
+
+_yunohost_cli()
+{
+local argc cur prev opts
+COMPREPLY=()
+
+argc=${COMP_CWORD}
+cur="${COMP_WORDS[argc]}"
+prev="${COMP_WORDS[argc-1]}" 
+opts=$(yunohost -h | grep usage | awk -F"{" '{print $2}' | awk -F"}" '{print $1}' | tr ',' ' ')
+
+if [[ $argc = 1 ]];
+then
+	COMPREPLY=( $(compgen -W "$opts --help" -- $cur ) )
+fi
+	
+if [[ "$prev" != "--help" ]];
+then
+	if [[ $argc = 2 ]];
+	then
+		opts2=$(yunohost $prev -h | grep usage | awk -F"{" '{print $2}' | awk -F"}" '{print $1}' | tr ',' ' ')
+		COMPREPLY=( $(compgen -W "$opts2 --help" -- $cur ) )
+	elif [[ $argc = 3 ]];
+	then
+        	COMPREPLY=( $(compgen -W "--help" $cur ) )
+	fi
+else 
+	COMPREPLY=()
+fi
+
+}
+complete -F _yunohost_cli yunohost

parse_args

@@ -33,7 +33,7 @@ gettext.install('YunoHost')
 try:
     from yunohost import YunoHostError, YunoHostLDAP, str_to_func, colorize, pretty_print_dict, display_error, connect_services, disconnect_services
 except ImportError:
-    sys.stderr.write('Require YunoHost lib')
+    sys.stderr.write('Error: Yunohost CLI Require YunoHost lib\n')
     sys.exit(1)
 
 """

yunohost.py

@@ -2,7 +2,12 @@
 
 import os
 import sys
-import ldap
+try:
+    import ldap
+except ImportError:
+    sys.stderr.write('Error: Yunohost CLI Require LDAP lib\n')
+    sys.stderr.write('apt-get install python-ldap\n')
+    sys.exit(1)
 import ldap.modlist as modlist
 import json
 import re

yunohost_monitor.py

@@ -3,7 +3,12 @@
 import os
 import sys
 import subprocess
-import psutil
+try:
+    import psutil
+except ImportError:
+    sys.stderr.write('Error: Yunohost CLI Require psutil\n')
+    sys.stderr.write('apt-get install python-psutil\n')
+    sys.exit(1)
 from datetime import datetime, timedelta
 #from psutil._compat import print_