[Python-checkins] cpython (3.2): Stop ignoring RPMs in distutils' upload command (#2945).

Sun Feb 5 13:50:13 CET 2012

http://hg.python.org/cpython/rev/26aea1825418
changeset: 74788:26aea1825418
branch: 3.2
user: Éric Araujo <merwok at netwok.org>
date: Sun Jan 15 02:48:55 2012 +0100
summary:
 Stop ignoring RPMs in distutils' upload command (#2945).
Bug reported by Hartmut Goebel and patch contributed by Carl Robben.
Carl tested the fix and we have a buildbot with rpm installed, so I’m
committing even though I could not run this test (but I do understand
the changed code :)
files:
 Lib/distutils/command/bdist_rpm.py | 12 ++++++++++++
 Lib/distutils/tests/test_bdist_rpm.py | 9 +++++++++
 Misc/ACKS | 1 +
 Misc/NEWS | 2 ++
 4 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/Lib/distutils/command/bdist_rpm.py b/Lib/distutils/command/bdist_rpm.py
--- a/Lib/distutils/command/bdist_rpm.py
+++ b/Lib/distutils/command/bdist_rpm.py
@@ -365,16 +365,28 @@
 self.spawn(rpm_cmd)
 
 if not self.dry_run:
+ if self.distribution.has_ext_modules():
+ pyversion = get_python_version()
+ else:
+ pyversion = 'any'
+
 if not self.binary_only:
 srpm = os.path.join(rpm_dir['SRPMS'], source_rpm)
 assert(os.path.exists(srpm))
 self.move_file(srpm, self.dist_dir)
+ filename = os.path.join(self.dist_dir, source_rpm)
+ self.distribution.dist_files.append(
+ ('bdist_rpm', pyversion, filename))
 
 if not self.source_only:
 for rpm in binary_rpms:
 rpm = os.path.join(rpm_dir['RPMS'], rpm)
 if os.path.exists(rpm):
 self.move_file(rpm, self.dist_dir)
+ filename = os.path.join(self.dist_dir,
+ os.path.basename(rpm))
+ self.distribution.dist_files.append(
+ ('bdist_rpm', pyversion, filename))
 
 def _dist_path(self, path):
 return os.path.join(self.dist_dir, os.path.basename(path))
diff --git a/Lib/distutils/tests/test_bdist_rpm.py b/Lib/distutils/tests/test_bdist_rpm.py
--- a/Lib/distutils/tests/test_bdist_rpm.py
+++ b/Lib/distutils/tests/test_bdist_rpm.py
@@ -78,6 +78,10 @@
 dist_created = os.listdir(os.path.join(pkg_dir, 'dist'))
 self.assertTrue('foo-0.1-1.noarch.rpm' in dist_created)
 
+ # bug #2945: upload ignores bdist_rpm files
+ self.assertIn(('bdist_rpm', 'any', 'dist/foo-0.1-1.src.rpm'), dist.dist_files)
+ self.assertIn(('bdist_rpm', 'any', 'dist/foo-0.1-1.noarch.rpm'), dist.dist_files)
+
 def test_no_optimize_flag(self):
 
 # XXX I am unable yet to make this test work without
@@ -117,6 +121,11 @@
 
 dist_created = os.listdir(os.path.join(pkg_dir, 'dist'))
 self.assertTrue('foo-0.1-1.noarch.rpm' in dist_created)
+
+ # bug #2945: upload ignores bdist_rpm files
+ self.assertIn(('bdist_rpm', 'any', 'dist/foo-0.1-1.src.rpm'), dist.dist_files)
+ self.assertIn(('bdist_rpm', 'any', 'dist/foo-0.1-1.noarch.rpm'), dist.dist_files)
+
 os.remove(os.path.join(pkg_dir, 'dist', 'foo-0.1-1.noarch.rpm'))
 
 def test_suite():
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -765,6 +765,7 @@
 Juan M. Bello Rivas
 Davide Rizzo
 Anthony Roach
+Carl Robben
 Mark Roberts
 Jim Robinson
 Andy Robinson
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -97,6 +97,8 @@
 Library
 -------
 
+- Issue #2945: Make the distutils upload command aware of bdist_rpm products.
+
 - Issue #13642: Unquote before b64encoding user:password during Basic
 Authentication. Patch contributed by Joonas Kuorilehto.
 
-- 
Repository URL: http://hg.python.org/cpython
