github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-13 21:56:32 +00:00
Code Issues Projects Releases Wiki Activity

obs: pkglib: dont grep if file does not exit.

Browse Source 
When tries to get release number from a new repo, the
specfile wont exist. Dont do grep in this case.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
This commit is contained in:
Jose Carlos Venegas Munoz 2018-08-30 20:58:45 -05:00
parent 3d06a83814
commit 985f88e763
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
obs-packaging/scripts/pkglib.sh
View File

@ -305,7 +305,7 @@ function get_obs_pkg_release() {
local obs_pkg_name="$1" local obs_pkg_name="$1"
local pkg local pkg
local repo_dir local repo_dir
local release local release=""
pkg=$(basename "${obs_pkg_name}") pkg=$(basename "${obs_pkg_name}")
repo_dir=$(mktemp -d -u -t "${pkg}.XXXXXXXXXXX") repo_dir=$(mktemp -d -u -t "${pkg}.XXXXXXXXXXX")
@ -314,9 +314,9 @@ function get_obs_pkg_release() {
spec_file=$(find "${repo_dir}" -maxdepth 1 -type f -name '*.spec' | head -1) spec_file=$(find "${repo_dir}" -maxdepth 1 -type f -name '*.spec' | head -1)
# Find in specfile in Release: XX field. # Find in specfile in Release: XX field.
release=$(grep -oP 'Release:\s+[0-9]+' "${spec_file}" | grep -oP '[0-9]+') [ ! -f "${spec_file}" ] || release=$(grep -oP 'Release:\s+[0-9]+' "${spec_file}" | grep -oP '[0-9]+')
if [ -z "${release}" ]; then if [ -z "${release}" ] && [ -f "${spec_file}" ] ; then
# Not release number found find in "%define release XX" # Not release number found find in "%define release XX"
release=$(grep -oP '%define\s+release\s+[0-9]+' "${spec_file}" | grep -oP '[0-9]+') release=$(grep -oP '%define\s+release\s+[0-9]+' "${spec_file}" | grep -oP '[0-9]+')
fi fi
@ -324,7 +324,7 @@ function get_obs_pkg_release() {
release_file=$(find "${repo_dir}" -maxdepth 1 -type f -name 'pkg-release') release_file=$(find "${repo_dir}" -maxdepth 1 -type f -name 'pkg-release')
if [ -z "${release}" ] && [ -f "${release_file}" ]; then if [ -z "${release}" ] && [ -f "${release_file}" ]; then
# Release still not found check pkg-release file # Release still not found check pkg-release file
release=$(grep -oP '[0-9]+' ${release_file}) release=$(grep -oP '[0-9]+' "${release_file}")
fi fi
if [ -z "${release}" ]; then if [ -z "${release}" ]; then
# Not release number found, this is a new repository. # Not release number found, this is a new repository.