openstack
/
fuel-mirror
Code Issues Proposed changes

[publish] Add hotfix repo to version check 

Fix version checking for hostfix packages. It  should be checked
   against hotfix repository as well.

Change-Id: I45494ee36aca1af6a7051664266ac94d2659f1e2
This commit is contained in:
Dmitry Burmistrov 2016-09-26 13:58:35 +03:00
parent 6b6b27536f
commit 775e859e5e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
perestroika/publisher.v5/publish-rpm-binaries.sh
View File

@ -127,13 +127,16 @@ main() {
local _repoid_proposed=$(mktemp -u XXXXXXXX)
local _repoid_holdback=$(mktemp -u XXXXXXXX)
local _repoid_security=$(mktemp -u XXXXXXXX)
local _repoid_hotfix=$(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_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}"
local repoquery_cmd="${repoquery_cmd} --repofrompath=${_repoid_proposed},file://${REPO_BASE_PATH}/${RPM_PROPOSED_REPO_PATH}/${PACKAGEFOLDER%/*} --repoid=${_repoid_proposed}"
else
local repoquery_cmd="${repoquery_cmd} --repofrompath=${_repoid_hotfix},file://${REPO_BASE_PATH}/${RPM_HOTFIX_REPO_PATH}/${PACKAGEFOLDER%/*} --repoid=${_repoid_hotfix}"
fi
[ "${binary:(-7)}" == "src.rpm" ] && repoquery_cmd="${repoquery_cmd} --archlist=src"
local EXISTBINDATA=$(${repoquery_cmd} ${BINNAME} 2>/dev/null)