From b87a29712693059260372566c6c2480607463515 Mon Sep 17 00:00:00 2001 From: Alexander Evseev Date: Fri, 9 Sep 2016 13:36:21 +0300 Subject: [PATCH] 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 --- perestroika/publisher.v5/publish-rpm-binaries.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/perestroika/publisher.v5/publish-rpm-binaries.sh b/perestroika/publisher.v5/publish-rpm-binaries.sh index d8a257e..156aeab 100755 --- a/perestroika/publisher.v5/publish-rpm-binaries.sh +++ b/perestroika/publisher.v5/publish-rpm-binaries.sh @@ -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)