diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2014-03-30 11:43:40 +0100 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-03-30 11:43:40 +0100 |
| commit | 49298396c6067617cc6ba08e0c88921c604c28b3 (patch) | |
| tree | e36d18c3043a81683bcca22ab25c58aa1711c797 /setuptools/command/bdist_rpm.py | |
| parent | 0407725e4bd3b01f41017b48aac1d57e3c6c3cf6 (diff) | |
| download | python-setuptools-git-49298396c6067617cc6ba08e0c88921c604c28b3.tar.gz | |
Remove legacy compatibility in bdist_rpm
--HG--
extra : amend_source : 829ebde0696d12adfb54aca74ea6b1b510177ff4
Diffstat (limited to 'setuptools/command/bdist_rpm.py')
| -rwxr-xr-x | setuptools/command/bdist_rpm.py | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/setuptools/command/bdist_rpm.py b/setuptools/command/bdist_rpm.py index 380fd196..d71420d5 100755 --- a/setuptools/command/bdist_rpm.py +++ b/setuptools/command/bdist_rpm.py @@ -1,10 +1,7 @@ # This is just a kludge so that bdist_rpm doesn't guess wrong about the # distribution name and version, if the egg_info command is going to alter -# them, another kludge to allow you to build old-style non-egg RPMs, and -# finally, a kludge to track .rpm files for uploading when run on Python <2.5. +# them, another kludge to allow you to build old-style non-egg RPMs. -import sys -import os from distutils.command.bdist_rpm import bdist_rpm as _bdist_rpm class bdist_rpm(_bdist_rpm): @@ -13,17 +10,6 @@ class bdist_rpm(_bdist_rpm): _bdist_rpm.initialize_options(self) self.no_egg = None - if sys.version<"2.5": - # Track for uploading any .rpm file(s) moved to self.dist_dir - def move_file(self, src, dst, level=1): - _bdist_rpm.move_file(self, src, dst, level) - if dst==self.dist_dir and src.endswith('.rpm'): - getattr(self.distribution,'dist_files',[]).append( - ('bdist_rpm', - src.endswith('.src.rpm') and 'any' or sys.version[:3], - os.path.join(dst, os.path.basename(src))) - ) - def run(self): self.run_command('egg_info') # ensure distro name is up-to-date _bdist_rpm.run(self) |
