From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 9 Dec 2010 22:28:25 +0000 (+0100)
Subject: subunitrun: Extend hack to cope with older system subunit run installs.
X-Git-Url: http://git.samba.org/?p=metze%2Fsamba%2Fwip.git;a=commitdiff_plain;h=bdf5a49cec064c965c1271d875fc9b474b77f634

subunitrun: Extend hack to cope with older system subunit run installs.
---

diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index 4078562ab440..9717c9e345ad 100755
--- a/source4/scripting/bin/subunitrun
+++ b/source4/scripting/bin/subunitrun
@@ -30,6 +30,8 @@ try:
     from subunit.run import SubunitTestRunner, TestProgram
 except ImportError:
     del sys.modules["subunit"]
+    if "subunit.run" in sys.modules:
+        del sys.modules["subunit.run"]
     samba.import_bundled_package("subunit", "subunit/python")
     from subunit.run import SubunitTestRunner, TestProgram
 import samba.getopt as options