diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-04-01 10:28:21 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-04-01 10:28:21 +0200 |
| commit | df34303d5d997384a9f6c467052dfee417866c9a (patch) | |
| tree | 48f4ea02730aa8429e2269704887ed8f32b50473 | |
| parent | 0cd39935acbf8d9a910ece88300c644b3b98e1d8 (diff) | |
| download | buildscripts-df34303d5d997384a9f6c467052dfee417866c9a.tar.gz buildscripts-df34303d5d997384a9f6c467052dfee417866c9a.tar.bz2 buildscripts-df34303d5d997384a9f6c467052dfee417866c9a.zip | |
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.
| -rwxr-xr-x | bin/build-rpm-package | 4 |
1 files 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 |