Sandro Bonazzola has uploaded a new change for review. Change subject: packaging: allow to override sos version ......................................................................
packaging: allow to override sos version Change-Id: Id5c6cd685f5bf7f7c1b49dc769e46bb6aa3adfff Signed-off-by: Sandro Bonazzola <sbona...@redhat.com> Related-To: https://bugzilla.redhat.com/1037663 --- M configure.ac 1 file changed, 14 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-log-collector refs/changes/51/27851/1 diff --git a/configure.ac b/configure.ac index 4539ab2..e64b3a5 100644 --- a/configure.ac +++ b/configure.ac @@ -64,11 +64,20 @@ esac AX_PYTHON_MODULE([ovirtsdk]) -AX_PYTHON_MODULE([sos], [fatal]) -AC_MSG_CHECKING(sos version) - AC_ARG_VAR([SOS_VERSION], [SOS utility version]) - SOS_VERSION=`$PYTHON -c "import sos; print(sos.__version__)" |cut -c1 2>/dev/null` - AC_MSG_RESULT($SOS_VERSION) + + +AC_ARG_WITH( + [sos-version], + [AS_HELP_STRING([--with-sos-version], [sos version to use])], + [SOS_VERSION="${withval}"], + [ + AX_PYTHON_MODULE([sos], [fatal]) + SOS_VERSION="$(${PYTHON} -c "import sos; print(sos.__version__.split('.', 2)[[0]])" 2>/dev/null)" + ] +) + +AC_MSG_CHECKING([sos version]) +AC_MSG_RESULT([${SOS_VERSION}]) AM_CONDITIONAL([SOS2], [test x"${SOS_VERSION}" == x2]) -- To view, visit http://gerrit.ovirt.org/27851 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id5c6cd685f5bf7f7c1b49dc769e46bb6aa3adfff Gerrit-PatchSet: 1 Gerrit-Project: ovirt-log-collector Gerrit-Branch: ovirt-log-collector-3.4 Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
