From 25a0750b8184e434e30717bb47f0b36a00e41629 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 5 Mar 2010 11:53:19 +1100 Subject: s4-python: only install external python libs that are missing --- source4/script/installmisc.sh | 8 +++++++- source4/scripting/python/samba_external/missing.py | 12 ++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100755 source4/scripting/python/samba_external/missing.py (limited to 'source4') diff --git a/source4/script/installmisc.sh b/source4/script/installmisc.sh index fecd1ebbf6..6aaf6bec84 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 0000000000..50bda65a21 --- /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) -- cgit