s4-python: allow us to have samba copies of python libraries we depend on

For python libraries like dns.resolver it is useful to be able to install
a copy of the library with Samba. This set of functions allows us to do that
while using the locally installed version if it is available

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/script/installmisc.sh b/source4/script/installmisc.sh
index 73dbdd996fcbe0f55ed515b504bf6eaa9aa91243..fecd1ebbf6f81860103e85428a9fc24be8cb0a9b 100755 (executable)
--- a/source4/script/installmisc.sh
+++ b/source4/script/installmisc.sh
@@ -81,4 +81,8 @@ cp setup/provision.smb.conf.member $SETUPDIR || exit 1
 cp setup/provision.smb.conf.standalone $SETUPDIR || exit 1
 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
+
 exit 0

diff --git a/source4/scripting/python/samba/external.py b/source4/scripting/python/samba/external.py
new file mode 100644 (file)
index 0000000..eca910b
--- /dev/null
+++ b/source4/scripting/python/samba/external.py
@@ -0,0 +1,50 @@
+#!/usr/bin/python
+
+# Unix SMB/CIFS implementation.
+# Copyright (C) Andrew Tridgell 2010
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import sys, os
+
+def samba_find_external(directory):
+    '''insert into out module search path the path to an
+       external library'''
+    for p in sys.path:
+        dir = os.path.join(p, directory)
+        if os.path.isdir(dir):
+            sys.path.insert(0, dir)
+            return
+
+    # finally try in the local directory, to handle in-tree testing
+    dir = os.path.join("scripting/python", directory)
+    if os.path.isdir(dir):
+        sys.path.insert(0, dir)
+        return
+
+    print "Failed to find external python library %s" % directory
+    raise
+
+
+def samba_external_dns_resolver():
+    '''try and import the dns.resolver library, and if it fails
+    then use a local copy from the external directory'''
+
+    try:
+        import dns.resolver as dns
+    except:
+        samba_find_external("samba_external/dnspython")
+        import dns.resolver as dns
+    return dns