[X2Go-Commits] [buildscripts] 01/01: bin/build-rpm-package: additionally allow underscore and hyphen characters in a mock base config file name definition.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit df34303d5d997384a9f6c467052dfee417866c9a
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Apr 1 10:28:21 2015 +0200

    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

--
Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git