decode file list for setup.py on python2

This commit is contained in:
Daniel Wallace 2018-02-01 09:48:52 -07:00
parent 5c3ede4022
commit 8ebf937b21
No known key found for this signature in database
GPG key ID: 5FA5E5544F010D48

View file

@ -522,7 +522,8 @@ class Sdist(sdist):
self.run_command('write_salt_ssh_packaging_file')
self.filelist.files.append(os.path.basename(PACKAGED_FOR_SALT_SSH_FILE))
sdist.make_release_tree(self, base_dir, files)
pkgfiles = [pkgfile if IS_PY3 else pkgfile.decode(__salt_system_encoding__) for pkgfile in files]
sdist.make_release_tree(self, base_dir, pkgfiles)
# Let's generate salt/_version.py to include in the sdist tarball
self.distribution.running_salt_sdist = True