Fixed bug "[#466200] ability to specify a 'verify' script".
* Lib/distutils/command/bdist_rpm.py
(bdist_rpm.initialize_options): Included verify_script attribute.
(bdist_rpm.finalize_package_data): Ensure that verify_script is a filename.
(bdist_rpm._make_spec_file): Included verify_script in script_options
tuple.
* Misc/NEWS
Mention change.
diff --git a/Lib/distutils/command/bdist_rpm.py b/Lib/distutils/command/bdist_rpm.py
index 597b26c..0dad1ac 100644
--- a/Lib/distutils/command/bdist_rpm.py
+++ b/Lib/distutils/command/bdist_rpm.py
@@ -129,6 +129,7 @@
self.build_script = None
self.install_script = None
self.clean_script = None
+ self.verify_script = None
self.pre_install = None
self.post_install = None
self.pre_uninstall = None
@@ -208,6 +209,7 @@
self.ensure_filename('build_script')
self.ensure_filename('install_script')
self.ensure_filename('clean_script')
+ self.ensure_filename('verify_script')
self.ensure_filename('pre_install')
self.ensure_filename('post_install')
self.ensure_filename('pre_uninstall')
@@ -424,6 +426,7 @@
"--root=$RPM_BUILD_ROOT "
"--record=INSTALLED_FILES") % self.python),
('clean', 'clean_script', "rm -rf $RPM_BUILD_ROOT"),
+ ('verifyscript', 'verify_script', None),
('pre', 'pre_install', None),
('post', 'post_install', None),
('preun', 'pre_uninstall', None),
diff --git a/Misc/NEWS b/Misc/NEWS
index 4fc52ea..d35cc0f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -355,7 +355,7 @@
- Fixed bug #470582: sre module would return a tuple (None, 'a', 'ab')
when applying the regular expression '^((a)c)?(ab)$' on 'ab'. It now
returns (None, None, 'ab'), as expected. Also fixed handling of
- lastindex/lastgroup match attributes in a similar cases. For example,
+ lastindex/lastgroup match attributes in similar cases. For example,
when running the expression r'(a)(b)?b' over 'ab', lastindex must be
1, not 2.
@@ -558,6 +558,10 @@
- New pdb command `pp' which is like `p' except that it pretty-prints
the value of its expression argument.
+- Now bdist_rpm distutils command understands a verify_script option in
+ the config file, including the contents of the referred filename in
+ the "%verifyscript" section of the rpm spec file.
+
Tools/Demos
-----------