Look for yum instead of rpm when caching devstack
On CentOS 6.x the rpm executable is in /bin instead of /usr/bin, but cache_devstack.py ends up running yum if it wants to download RPM packages anyway. Look for yum instead of rpm as an indication of which packages to install. Change-Id: Iad79c0fcf66d2bd457195f007009c76f6e6aa2d2
This commit is contained in:
parent
c183c33710
commit
fa18656f1c
@ -119,7 +119,7 @@ def local_prep(distribution):
|
||||
tokenize(fn, debs, distribution, comment='#')
|
||||
branch_data['debs'] = debs
|
||||
|
||||
if os.path.exists('/usr/bin/rpm'):
|
||||
if os.path.exists('/usr/bin/yum'):
|
||||
rpms = []
|
||||
rpmdir = os.path.join(DEVSTACK, 'files', 'rpms')
|
||||
for fn in os.listdir(rpmdir):
|
||||
|
Loading…
x
Reference in New Issue
Block a user