Look for yum instead of rpm in elements too
On CentOS 6.x the rpm executable is in /bin instead of /usr/bin, but
the cache-devstack element 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.
Commit fa18656
fixed this in cache_devstack.py for snapshot images,
but missed that it was affecting diskimage-builder elements as well.
Change-Id: I4b76a48564cd5d703d79cfda88bbbfe97216a70a
This commit is contained in:
parent
427d38d603
commit
572c35a827
|
@ -153,7 +153,7 @@ def local_prep(distribution):
|
|||
tokenize(fn, debs, distribution, comment='#')
|
||||
branch_data['debs'] = debs
|
||||
|
||||
if os.path.exists(os.path.join(TMP_MOUNT_PATH, 'usr/bin/rpm')):
|
||||
if os.path.exists(os.path.join(TMP_MOUNT_PATH, 'usr/bin/yum')):
|
||||
rpms = []
|
||||
rpmdir = os.path.join(DEVSTACK, 'files', 'rpms')
|
||||
for fn in os.listdir(rpmdir):
|
||||
|
|
Loading…
Reference in New Issue