summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2011-12-11 01:01:46 +1030
committerRusty Russell <rusty@rustcorp.com.au>2011-12-12 06:33:44 +0100
commit08019a0973fb2ccf1ee4fa8c6523808033058456 (patch)
treeb017bfbc538667d6e0caa60c439482dc56409a8b /source4
parent422494a8e630e2ca89386344eaa5346388698a32 (diff)
downloadsamba-08019a0973fb2ccf1ee4fa8c6523808033058456.tar.gz
samba-08019a0973fb2ccf1ee4fa8c6523808033058456.tar.bz2
samba-08019a0973fb2ccf1ee4fa8c6523808033058456.zip
tdb2: don't use TDB2 versions of test tdb files.
Now tdb2 handles tdb1 files, we don't need most of commit 5eecc854236f0b943aaa89e0c3a46f9fbd208ca9 which added TDB2 versions of all the testing tdbs. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Autobuild-User: Rusty Russell <rusty@rustcorp.com.au> Autobuild-Date: Mon Dec 12 06:33:44 CET 2011 on sn-devel-104
Diffstat (limited to 'source4')
-rw-r--r--source4/scripting/python/samba/samba3/__init__.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/source4/scripting/python/samba/samba3/__init__.py b/source4/scripting/python/samba/samba3/__init__.py
index dd2f927aa4..a955be1a73 100644
--- a/source4/scripting/python/samba/samba3/__init__.py
+++ b/source4/scripting/python/samba/samba3/__init__.py
@@ -53,12 +53,9 @@ class TdbDatabase(object):
def __init__(self, file):
"""Open a file.
- :param file: Path of the file to open (appending "2" if TDB2 enabled).
+ :param file: Path of the file to open.
"""
- if tdb.__version__.startswith("2"):
- self.tdb = tdb.Tdb(file + "2", flags=os.O_RDONLY)
- else:
- self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
+ self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
self._check_version()
def _check_version(self):