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

diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index 4078562ab440e1e4a670c1a92bd669147fa649b9..9717c9e345ad8b3ce78cc4194783f9df0fe09135 100755 (executable)
--- 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