mirror of
https://github.com/samba-team/samba.git
synced 2024-12-25 23:21:54 +03:00
b161b3a891
mdb_copy() was dutifully checking the PATH for the mdb_copy executable,
then, if it didn't find it, blindly proceeding anyway and trying to run
a non-existent executable. This resulted in a cryptic error:
ERROR(<type 'exceptions.OSError'>): uncaught exception - [Errno 2] No
such file or directory
Add in an extra check that we actually find the executable and raise a
better human-readable exception if we don't.
Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Fri Nov 9 21:07:47 CET 2018 on sn-devel-144
45 lines
1.5 KiB
Python
45 lines
1.5 KiB
Python
# Unix SMB/CIFS implementation.
|
|
# mdb util helpers
|
|
#
|
|
# Copyright (C) Andrew Bartlett <abartlet@samba.org> 2018
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
import samba
|
|
import subprocess
|
|
import os
|
|
from samba.netcmd import CommandError
|
|
|
|
|
|
def mdb_copy(file1, file2):
|
|
"""Copy mdb file using mdb_copy utility and rename it
|
|
"""
|
|
# Find the location of the mdb_copy tool
|
|
dirs = os.getenv('PATH').split(os.pathsep)
|
|
found = False
|
|
for d in dirs:
|
|
toolpath = os.path.join(d, "mdb_copy")
|
|
if os.path.exists(toolpath):
|
|
found = True
|
|
break
|
|
|
|
if not found:
|
|
raise CommandError("mdb_copy not found. "
|
|
"You may need to install the lmdb-utils package")
|
|
|
|
mdb_copy_cmd = [toolpath, "-n", file1, "%s.copy.mdb" % file1]
|
|
status = subprocess.check_call(mdb_copy_cmd, close_fds=True, shell=False)
|
|
|
|
os.rename("%s.copy.mdb" % file1, file2)
|