From: Colin Walters <walters@verbum.org>
Date: Tue, 19 Sep 2017 13:46:17 +0000 (-0400)
Subject: ci: Use distro-sync instead of upgrade
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~31^2~67
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1036cc808470a8d17b83f5896c000fa76c8f43d0;p=ostree.git

ci: Use distro-sync instead of upgrade

This should help ensure that if installing `glibc-devel` downgrades `glibc`
we'll run through our hackround for
<https://bugzilla.redhat.com/show_bug.cgi?id=1394862>.

Closes: #1190
Approved by: jlebon
---

diff --git a/ci/libbuild.sh b/ci/libbuild.sh
index 0e024063..2b600dc7 100644
--- a/ci/libbuild.sh
+++ b/ci/libbuild.sh
@@ -2,12 +2,13 @@
 
 pkg_upgrade() {
     # https://bugzilla.redhat.com/show_bug.cgi?id=1483553
-    if ! yum -y upgrade 2>err.txt; then
-        ecode=$?
-        if grep -q -F -e "BDB1539 Build signature doesn't match environment" err.txt; then
-            rpm --rebuilddb
-            yum -y upgrade
-        else
+    ecode=0
+    yum -y distro-sync 2>err.txt || ecode=$?
+    if test ${ecode} '!=' 0 && grep -q -F -e "BDB1539 Build signature doesn't match environment" err.txt; then
+        rpm --rebuilddb
+        yum -y distro-sync
+    else
+        if test ${ecode} '!=' 0; then
             cat err.txt
             exit ${ecode}
         fi