From e4af3afd7ae3e39218b42a42d39c2ec10be9a642 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 31 Mar 2010 03:15:24 +0200
Subject: samba_external: Simplify script to find missing external packages;
 include subunit and testtools as well.

---
 source4/scripting/python/samba_external/missing.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'source4/scripting/python/samba_external/missing.py')

diff --git a/source4/scripting/python/samba_external/missing.py b/source4/scripting/python/samba_external/missing.py
index 50bda65a210..082afd83971 100755
--- a/source4/scripting/python/samba_external/missing.py
+++ b/source4/scripting/python/samba_external/missing.py
@@ -2,11 +2,17 @@
 
 # work out what python external libraries we need to install
 
+external_libs = {
+    "dns.resolver": "dnspython", 
+    "subunit": "subunit",
+    "testtools": "testtools"}
+
 list = []
 
-try:
-    import dns.resolver
-except:
-    list.append("dnspython")
+for module, package in external_libs.iteritems():
+    try:
+        __import__(module)
+    except ImportError:
+        list.append(package)
 
 print ' '.join(list)
-- 
cgit 


From 5f3fcf7a7773737fd87c8ff5530fae2286e88927 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 31 Mar 2010 03:56:24 +0200
Subject: s4-python: Install external included packages only if they're not
 present on the system.

---
 source4/scripting/python/samba_external/missing.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'source4/scripting/python/samba_external/missing.py')

diff --git a/source4/scripting/python/samba_external/missing.py b/source4/scripting/python/samba_external/missing.py
index 082afd83971..d3dd2b9290f 100755
--- a/source4/scripting/python/samba_external/missing.py
+++ b/source4/scripting/python/samba_external/missing.py
@@ -1,11 +1,10 @@
 #!/usr/bin/python
 
 # work out what python external libraries we need to install
-
 external_libs = {
-    "dns.resolver": "dnspython", 
-    "subunit": "subunit",
-    "testtools": "testtools"}
+    "dns.resolver": "dnspython/dns", 
+    "subunit": "subunit/python/subunit",
+    "testtools": "testtools/testtools"}
 
 list = []
 
-- 
cgit