diff options
author | Anthon van der Neut <anthon@mnt.org> | 2017-06-24 07:18:46 +0200 |
---|---|---|
committer | Anthon van der Neut <anthon@mnt.org> | 2017-06-24 07:18:46 +0200 |
commit | 325d9d4f536aad2f1ee2f0cd74d61791b3561fac (patch) | |
tree | e3dc7cb1b883d339d2cf33f02c5de026f9b47a81 /setup.py | |
parent | 84b55be25f6969f4df3a3ad7badad7bde6da1dc0 (diff) | |
download | ruamel.yaml-325d9d4f536aad2f1ee2f0cd74d61791b3561fac.tar.gz |
fix issue #130: regression in nested merges
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -237,7 +237,8 @@ class MySdist(_sdist): def initialize_options(self): _sdist.initialize_options(self) # because of unicode_literals - self.formats = [b'bztar'] if sys.version_info < (3, ) else ['bztar'] + fmt = getattr(self, 'tarfmt', None) + self.formats = fmt if fmt else [b'bztar'] if sys.version_info < (3, ) else ['bztar'] dist_base = os.environ.get('PYDISTBASE') fpn = getattr(getattr(self, 'nsp', self), 'full_package_name', None) if fpn and dist_base: @@ -828,6 +829,8 @@ def main(): nsp.check() nsp.create_dirs() MySdist.nsp = nsp + if pkg_data.get('tarfmt'): + MySdist.tarfmt = pkg_data.get('tarfmt') MyBdistWheel.nsp = nsp kw = dict( name=nsp.full_package_name, |