Don't check hotfix version against proposed repo
Hotfixes have own workflow and versioning and must be not checked against package versions in proposed repository. Skip proposed repository when checking hotfix package version. Change-Id: I2d0fdd90fc84a9ac1f988893060c73e473b5c955 Closes-Bug: #1621486
This commit is contained in:
parent
8a5eacfe34
commit
b87a297126
|
@ -129,9 +129,12 @@ main() {
|
|||
local _repoid_security=$(mktemp -u XXXXXXXX)
|
||||
local repoquery_cmd="repoquery --repofrompath=${_repoid_os},file://${REPO_BASE_PATH}/${RPM_OS_REPO_PATH}/${PACKAGEFOLDER%/*} --repoid=${_repoid_os}"
|
||||
local repoquery_cmd="${repoquery_cmd} --repofrompath=${_repoid_updates},file://${REPO_BASE_PATH}/${RPM_UPDATES_REPO_PATH}/${PACKAGEFOLDER%/*} --repoid=${_repoid_updates}"
|
||||
local repoquery_cmd="${repoquery_cmd} --repofrompath=${_repoid_proposed},file://${REPO_BASE_PATH}/${RPM_PROPOSED_REPO_PATH}/${PACKAGEFOLDER%/*} --repoid=${_repoid_proposed}"
|
||||
local repoquery_cmd="${repoquery_cmd} --repofrompath=${_repoid_holdback},file://${REPO_BASE_PATH}/${RPM_HOLDBACK_REPO_PATH}/${PACKAGEFOLDER%/*} --repoid=${_repoid_holdback}"
|
||||
local repoquery_cmd="${repoquery_cmd} --repofrompath=${_repoid_security},file://${REPO_BASE_PATH}/${RPM_SECURITY_REPO_PATH}/${PACKAGEFOLDER%/*} --repoid=${_repoid_security}"
|
||||
# Hotfixes must not be checked against proposed repository
|
||||
if [ "${IS_HOTFIX}" != 'true' ]; then
|
||||
local repoquery_cmd="${repoquery_cmd} --repofrompath=${_repoid_proposed},file://${REPO_BASE_PATH}/${RPM_PROPOSED_REPO_PATH}/${PACKAGEFOLDER%/*} --repoid=${_repoid_proposed}"
|
||||
fi
|
||||
[ "${binary:(-7)}" == "src.rpm" ] && repoquery_cmd="${repoquery_cmd} --archlist=src"
|
||||
local EXISTBINDATA=$(${repoquery_cmd} ${BINNAME} 2>/dev/null)
|
||||
|
||||
|
|
Loading…
Reference in New Issue