Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: repoman/, /
Date: Wed, 02 May 2018 02:30:32
Message-Id: 1525228153.5914efcecc6821c09aa1e6a62d0da8ee3fe8b56f.zmedico@gentoo
1 commit: 5914efcecc6821c09aa1e6a62d0da8ee3fe8b56f
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Wed May 2 02:27:12 2018 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Wed May 2 02:29:13 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=5914efce
7
8 setup.py: fix sdist bztar format default for python3.6
9
10 Since python3.6 defaults to gztar format unconditionally,
11 override it.
12
13 repoman/setup.py | 3 +--
14 setup.py | 3 +--
15 2 files changed, 2 insertions(+), 4 deletions(-)
16
17 diff --git a/repoman/setup.py b/repoman/setup.py
18 index 3bb76ab8a..16ee0bc63 100755
19 --- a/repoman/setup.py
20 +++ b/repoman/setup.py
21 @@ -347,8 +347,7 @@ class x_sdist(sdist):
22 """ sdist defaulting to .tar.bz2 format, and archive files owned by root """
23
24 def finalize_options(self):
25 - if self.formats is None:
26 - self.formats = ['bztar']
27 + self.formats = ['bztar']
28 if self.owner is None:
29 self.owner = 'root'
30 if self.group is None:
31
32 diff --git a/setup.py b/setup.py
33 index 6111a5582..86fd62470 100755
34 --- a/setup.py
35 +++ b/setup.py
36 @@ -535,8 +535,7 @@ class x_sdist(sdist):
37 """ sdist defaulting to .tar.bz2 format, and archive files owned by root """
38
39 def finalize_options(self):
40 - if self.formats is None:
41 - self.formats = ['bztar']
42 + self.formats = ['bztar']
43 if self.owner is None:
44 self.owner = 'root'
45 if self.group is None: