From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 5 Mar 2010 00:53:19 +0000 (+1100)
Subject: s4-python: only install external python libs that are missing
X-Git-Tag: samba-3.6.0pre1~4781
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25a0750b8184e434e30717bb47f0b36a00e41629;p=thirdparty%2Fsamba.git

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

diff --git a/source4/script/installmisc.sh b/source4/script/installmisc.sh
index fecd1ebbf6f..6aaf6bec846 100755
--- 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
index 00000000000..50bda65a210
--- /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)