From df34303d5d997384a9f6c467052dfee417866c9a Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Wed, 1 Apr 2015 10:28:21 +0200 Subject: bin/build-rpm-package: additionally allow underscore and hyphen characters in a mock base config file name definition. Also fix up a non-literal parsed period. --- bin/build-rpm-package | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/build-rpm-package b/bin/build-rpm-package index be686c9..cc7d304 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -257,8 +257,8 @@ create_mock_config () { # MOCK_BASE CUSTOM_REPO COMPONENT TARGET # Check argument sanity. typeset DISTRO="" - typeset TMP_REGEX='^([[:alpha:]]+)-[[:alnum:]]+-[[:alnum:]].cfg$' - # distribution - version - arch + # distribution - version - arch + typeset TMP_REGEX='^([[:alpha:]]+)-[[:alnum:]_-]+-[[:alnum]_-]+\.cfg$' if [[ ! "${MOCK_BASE}" =~ ${TMP_REGEX} ]]; then echo "Error: MOCK_BASE parameter not well formed. Must be: 'distro-version-arch.cfg'." >&2 exit -1 -- cgit v1.2.3