s4-python: only install external python libs that are missing

diff --git a/source4/script/installmisc.sh b/source4/script/installmisc.sh
index fecd1ebbf6f81860103e85428a9fc24be8cb0a9b..6aaf6bec846cea1c5d6059e62cda68fa4cc3e62d 100755 (executable)
--- a/source4/script/installmisc.sh
+++ b/source4/script/installmisc.sh
@@ -83,6 +83,12 @@ cp setup/dns_update_list $SETUPDIR || exit 1
 
 echo "Installing external python libraries"
 mkdir -p $PYTHONDIR/samba_external || exit 1
-cp -r scripting/python/samba_external/* $PYTHONDIR/samba_external/ || exit 1
+for p in $($PYTHON scripting/python/samba_external/missing.py);
+do
+  echo "Installing missing python library $p"
+  mkdir -p $PYTHONDIR/samba_external/$p
+  cp -r scripting/python/samba_external/$p/* $PYTHONDIR/samba_external/$p/ || exit 1
+done
+
 
 exit 0

diff --git a/source4/scripting/python/samba_external/missing.py b/source4/scripting/python/samba_external/missing.py
new file mode 100755 (executable)
index 0000000..50bda65
--- /dev/null
+++ b/source4/scripting/python/samba_external/missing.py
@@ -0,0 +1,12 @@
+#!/usr/bin/python
+
+# work out what python external libraries we need to install
+
+list = []
+
+try:
+    import dns.resolver
+except:
+    list.append("dnspython")
+
+print ' '.join(list)