[openstack-swift/el6-havana] remove more runtime python dependency checking

Pádraig Brady pbrady at fedoraproject.org
Fri Oct 18 12:34:18 UTC 2013


commit 5bff8f0ea52ef77f6ec7185e4db64c241e75e939
Author: Pádraig Brady <P at draigBrady.com>
Date:   Fri Oct 18 12:11:35 2013 +0100

    remove more runtime python dependency checking
    
    This caused swift services to fail (but exit 0),
    with error "xattr>=0.4"
    
    https://bugzilla.redhat.com/1020449

 openstack-swift.spec |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/openstack-swift.spec b/openstack-swift.spec
index f07c94d..5c75abe 100644
--- a/openstack-swift.spec
+++ b/openstack-swift.spec
@@ -176,6 +176,10 @@ rm -rf swift.egg-info
 # let RPM handle deps
 sed -i '/setup_requires/d; /install_requires/d; /dependency_links/d' setup.py
 
+# Remove the requirements file so that pbr hooks don't add it
+# to distutils requires_dist config
+rm -rf {test-,}requirements.txt
+
 # Remove dependency on pbr and set version as per rpm
 sed -i 's/%RPMVERSION%/%{version}/; s/%RPMRELEASE%/%{release}/' swift/__init__.py
 


More information about the scm-commits mailing list