From 44a980dff9d9181979c6c587a081eb446cc6f6df Mon Sep 17 00:00:00 2001 From: Greg Ward Date: Tue, 15 Aug 2000 13:05:35 +0000 Subject: [PATCH] Fixed the move-RPM-files hack so it knows about the '--binary-only' and '--source-only' options. --- Lib/distutils/command/bdist_rpm.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Lib/distutils/command/bdist_rpm.py b/Lib/distutils/command/bdist_rpm.py index 1da0b81f39..026a3ba4d5 100644 --- a/Lib/distutils/command/bdist_rpm.py +++ b/Lib/distutils/command/bdist_rpm.py @@ -295,14 +295,17 @@ class bdist_rpm (Command): # find out the names of the RPM files created; also, this assumes # that RPM creates exactly one source and one binary RPM. if not self.dry_run: - srpms = glob.glob(os.path.join(rpm_dir['SRPMS'], "*.rpm")) - rpms = glob.glob(os.path.join(rpm_dir['RPMS'], "*/*.rpm")) - assert len(srpms) == 1, \ - "unexpected number of SRPM files found: %s" % srpms - assert len(rpms) == 1, \ - "unexpected number of RPM files found: %s" % rpms - self.move_file(srpms[0], self.dist_dir) - self.move_file(rpms[0], self.dist_dir) + if not self.binary_only: + srpms = glob.glob(os.path.join(rpm_dir['SRPMS'], "*.rpm")) + assert len(srpms) == 1, \ + "unexpected number of SRPM files found: %s" % srpms + self.move_file(srpms[0], self.dist_dir) + + if not self.source_only: + rpms = glob.glob(os.path.join(rpm_dir['RPMS'], "*/*.rpm")) + assert len(rpms) == 1, \ + "unexpected number of RPM files found: %s" % rpms + self.move_file(rpms[0], self.dist_dir) # run() -- 2.40.0