From da3ddca19dbcefc9e0a2d39eb22d7f3a40b7f987 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Mon, 18 Mar 2019 14:34:49 -0400 Subject: Delimit operands of ob_parse_version() --- diff --git a/lib/changelog.sh b/lib/changelog.sh index 28357f5..06cb627 100644 --- a/lib/changelog.sh +++ b/lib/changelog.sh @@ -138,7 +138,8 @@ ob_parse_changelog() 'changelog_bad_source' \ "${source}" fi - if ! ob_parse_version "${version}"; then + if ! ob_parse_version -- "${version}" + then _ob_parse_changelog_error \ "${file}" "${line_nr}" \ "changelog_bad_sourc$(:\ diff --git a/lib/metadata/proteanos.sh b/lib/metadata/proteanos.sh index 38e4724..d0066f5 100644 --- a/lib/metadata/proteanos.sh +++ b/lib/metadata/proteanos.sh @@ -141,7 +141,7 @@ _ob_get_system_path() 'platconf') # source version plat [ ${#} -eq 3 ] || _ob_abort - ob_parse_version -u 'pkgver' "${2}" + ob_parse_version -u 'pkgver' -- "${2}" printf '%s/platconf/%s/%s\n' "${DATADIR}" "${3}" "${1}" printf '%s/platconf/%s/%s_%s\n' "${DATADIR}" \ "${3}" "${1}" "${pkgver}" diff --git a/src/opkbuild.sh b/src/opkbuild.sh index eec6a50..ffb68a2 100644 --- a/src/opkbuild.sh +++ b/src/opkbuild.sh @@ -232,7 +232,7 @@ setup_package() OPK_SOURCE="$(ob_get_source_parameter 'Source')" OPK_SOURCE_VERSION="$(ob_get_source_parameter 'Version')" - ob_parse_version -u 'OPK_SOURCE_VERSION_UPSTREAM' \ + ob_parse_version -u 'OPK_SOURCE_VERSION_UPSTREAM' -- \ "${OPK_SOURCE_VERSION}" OPK_BINARY_VERSION="$(ob_get_source_parameter 'Version')" -- cgit v0.9.1