summaryrefslogtreecommitdiff
path: root/setuptools/command
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2014-03-30 11:43:40 +0100
committerJason R. Coombs <jaraco@jaraco.com>2014-03-30 11:43:40 +0100
commit88a5aeb8faecad23c67ea7d40368b294391fca94 (patch)
treeb88e5aa093a4ec6f81fc81ded4d58148282ab171 /setuptools/command
parent7e2969c65dadbb7b835e345395e51ea7433e6e00 (diff)
downloadpython-setuptools-bitbucket-88a5aeb8faecad23c67ea7d40368b294391fca94.tar.gz
Remove legacy compatibility in bdist_rpm
Diffstat (limited to 'setuptools/command')
-rwxr-xr-xsetuptools/command/bdist_rpm.py16
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)