commit:     5914efcecc6821c09aa1e6a62d0da8ee3fe8b56f
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed May  2 02:27:12 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed May  2 02:29:13 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=5914efce

setup.py: fix sdist bztar format default for python3.6

Since python3.6 defaults to gztar format unconditionally,
override it.

 repoman/setup.py | 3 +--
 setup.py         | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/repoman/setup.py b/repoman/setup.py
index 3bb76ab8a..16ee0bc63 100755
--- a/repoman/setup.py
+++ b/repoman/setup.py
@@ -347,8 +347,7 @@ class x_sdist(sdist):
        """ sdist defaulting to .tar.bz2 format, and archive files owned by 
root """
 
        def finalize_options(self):
-               if self.formats is None:
-                       self.formats = ['bztar']
+               self.formats = ['bztar']
                if self.owner is None:
                        self.owner = 'root'
                if self.group is None:

diff --git a/setup.py b/setup.py
index 6111a5582..86fd62470 100755
--- a/setup.py
+++ b/setup.py
@@ -535,8 +535,7 @@ class x_sdist(sdist):
        """ sdist defaulting to .tar.bz2 format, and archive files owned by 
root """
 
        def finalize_options(self):
-               if self.formats is None:
-                       self.formats = ['bztar']
+               self.formats = ['bztar']
                if self.owner is None:
                        self.owner = 'root'
                if self.group is None:

Reply via email to