From: Jonathan Lebon <jonathan@jlebon.com>
Date: Mon, 23 Apr 2018 17:36:38 +0000 (-0400)
Subject: ci: drop BDB1539 workaround
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~24^2~31
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=01ea9a12e4713bf81d1ef0228d0813746c46bbb8;p=ostree.git

ci: drop BDB1539 workaround

This shouldn't be an issue anymore.

Closes: #1553
Approved by: cgwalters
---

diff --git a/ci/libpaprci/libbuild.sh b/ci/libpaprci/libbuild.sh
index 62dc2b29..6ce7dcec 100644
--- a/ci/libpaprci/libbuild.sh
+++ b/ci/libpaprci/libbuild.sh
@@ -6,18 +6,7 @@ OS_ID=$(. /etc/os-release; echo $ID)
 OS_VERSION_ID=$(. /etc/os-release; echo $VERSION_ID)
 
 pkg_upgrade() {
-    # https://bugzilla.redhat.com/show_bug.cgi?id=1483553
-    local 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
-    fi
+    yum -y distro-sync
 }
 
 make() {