From 59959cc216d32abfcbf5c390032380776d64cd6e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Oct 15 2018 14:39:53 +0000 Subject: tests: set SUDO for non-root for containers running root --- diff --git a/tests/test-rebuild.sh b/tests/test-rebuild.sh index 18d5bb7..6e2802a 100755 --- a/tests/test-rebuild.sh +++ b/tests/test-rebuild.sh @@ -47,8 +47,14 @@ fi git pull +if [ "$UID" != "0" ]; then + SUDO="sudo" +else + SUDO="" +fi + echo Running dnf builddep: -sudo dnf builddep $PKG.spec +$SUDO dnf builddep $PKG.spec fedpkg local @@ -62,7 +68,7 @@ PKGS=$(cd $ARCH; rpm -qp $(ls *-$VERREL*.rpm)) for i in $PKGS; do # FIXME: should check NVR is same before building - rpm -q --quiet $i || sudo dnf install -q $i + rpm -q --quiet $i || $SUDO dnf install -q $i for k in list requires provides scripts; do rpm -qp --$k $ARCH/$i.rpm | grep -v rpmlib > $TMP/$i.$k.test || : rpm -q --$k $i | grep -v rpmlib > $TMP/$i.$k.installed || :