From 08019a0973fb2ccf1ee4fa8c6523808033058456 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Sun, 11 Dec 2011 01:01:46 +1030 Subject: 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 Autobuild-User: Rusty Russell Autobuild-Date: Mon Dec 12 06:33:44 CET 2011 on sn-devel-104 --- source4/scripting/python/samba/samba3/__init__.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'source4/scripting') 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): -- cgit