From bb2c1e32b6614b01f9acef03871a0a403e59b06d Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Wed, 01 Aug 2012 03:05:48 -0400 Subject: Move metadata validation to oh_changelog_parse(). --- (limited to 'src') diff --git a/src/opkbuild.sh b/src/opkbuild.sh index 3ca6eab..94c12e8 100644 --- a/src/opkbuild.sh +++ b/src/opkbuild.sh @@ -55,14 +55,6 @@ export SIZE= export STRINGS= export STRIP= -# Constant global parameters: -SOURCE_VERSION_ID_RE='^' -SOURCE_VERSION_ID_RE="${SOURCE_VERSION_ID_RE}"'[0-9a-z.~]+' -SOURCE_VERSION_ID_RE="${SOURCE_VERSION_ID_RE}"'(\+sip[1-9][0-9]*)?' -SOURCE_VERSION_ID_RE="${SOURCE_VERSION_ID_RE}"'(-[1-9][0-9]*)?' -SOURCE_VERSION_ID_RE="${SOURCE_VERSION_ID_RE}"'(\+[a-z0-9]+-[1-9][0-9]*)?' -SOURCE_VERSION_ID_RE="${SOURCE_VERSION_ID_RE}"'$' - # Global parameters: OPT_BUILD= OPT_TARGET= @@ -231,14 +223,6 @@ setup_package() { OH_SOURCE="${OH_CHANGELOG_SOURCE}" OH_SOURCE_VERSION="${OH_CHANGELOG_VERSION}" - - # Validate source package version identifier. - echo "${OH_SOURCE_VERSION}" | grep -E "${SOURCE_VERSION_ID_RE}" \ - >/dev/null 2>&1 - if [ "${?}" -ne 0 ]; then - oh_error "${oh_str_bad_source_version}" "${OH_SOURCE_VERSION}" - fi - OH_SOURCE_VERSION_UPSTREAM="${OH_SOURCE_VERSION:%%-}" OH_BINARY_VERSION="${OH_SOURCE_VERSION}" -- cgit v0.9.1