diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-12-09 23:28:25 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-12-10 03:04:06 +0100 |
| commit | bdf5a49cec064c965c1271d875fc9b474b77f634 (patch) | |
| tree | 3d5e00e89deebde4a8f48b14d70bbdc67c874a61 /source4/scripting/bin/subunitrun | |
| parent | b1daa502935026854758dc47868866b022c53128 (diff) | |
| download | samba-bdf5a49cec064c965c1271d875fc9b474b77f634.tar.gz samba-bdf5a49cec064c965c1271d875fc9b474b77f634.tar.bz2 samba-bdf5a49cec064c965c1271d875fc9b474b77f634.zip | |
subunitrun: Extend hack to cope with older system subunit run installs.
Diffstat (limited to 'source4/scripting/bin/subunitrun')
| -rwxr-xr-x | source4/scripting/bin/subunitrun | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun index 4078562ab4..9717c9e345 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 |