diff --git a/rdiffweb/core/librdiff.py b/rdiffweb/core/librdiff.py index c399a1f99bc3889afd2a54bf38f63423f5846dfd..1fd6ccdfc71d1342f57fc676043c44c0d54af3a1 100755 --- a/rdiffweb/core/librdiff.py +++ b/rdiffweb/core/librdiff.py @@ -20,9 +20,14 @@ from __future__ import absolute_import from __future__ import unicode_literals import bisect +from builtins import bytes +from builtins import map +from builtins import object +from builtins import str import calendar from collections import OrderedDict from datetime import timedelta +from distutils import spawn import encodings import gzip import io @@ -38,10 +43,6 @@ import time import weakref import zlib -from builtins import bytes -from builtins import map -from builtins import object -from builtins import str from future.utils import iteritems from future.utils import python_2_unicode_compatible from future.utils.surrogateescape import encodefilename @@ -53,6 +54,7 @@ from rdiffweb.core import rdw_helpers from rdiffweb.core.archiver import archive, ARCHIVERS from rdiffweb.core.i18n import ugettext as _ + try: import subprocess32 as subprocess # @UnresolvedImport @UnusedImport except: @@ -816,7 +818,7 @@ class RdiffRepo(object): if os.environ.get('TMPDIR'): env['TMPDIR'] = os.environ['TMPDIR'] - parms = [b'rdiff-backup'] + parms = [spawn.find_executable('rdiff-backup')] parms.extend(args) execution = subprocess.Popen( parms, stdout=subprocess.PIPE,