From 8ebf937b213921905ee83c28a92fbe4380e7bbd0 Mon Sep 17 00:00:00 2001 From: Daniel Wallace Date: Thu, 1 Feb 2018 09:48:52 -0700 Subject: [PATCH] decode file list for setup.py on python2 --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ab40eb4fe7..56eb7a7410 100755 --- a/setup.py +++ b/setup.py @@ -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