]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commit
ceph-{,dev,dev-new} build: fix conditional for cephadm package test 1952/head
authorDan Mick <dmick@redhat.com>
Thu, 20 Jan 2022 21:44:36 +0000 (13:44 -0800)
committerDan Mick <dmick@redhat.com>
Thu, 20 Jan 2022 21:44:36 +0000 (13:44 -0800)
commita5bfa20d2f1335fd84124be79c2ab84b0d1b1f5b
treeeda64d4d164cb97e6ec0bdc746a6ad6f1d6cf03c
parentf71c19ecd8fee1a423cd65c41d035d51f3f8c2e0
ceph-{,dev,dev-new} build: fix conditional for cephadm package test

https://github.com/ceph/ceph-build/pull/1919 added a conditional
test to check for cephadm package existence (so the code to extract
cephadm could work on older builds that did not have a cephadm package).
However, it used bash's [[ operator, and that doesn't expand file globs
in its arguments, so it effectively stopped creating the cephadm
binary altogether.

Switch to [, which doesn't have that problem.

Signed-off-by: Dan Mick <dmick@redhat.com>
ceph-build/build/build_rpm
ceph-dev-build/build/build_rpm
ceph-dev-new-build/build/build_rpm
scripts/build_utils.sh