From a7145410fbc7e73188fde449628fa0343b05e4a4 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Apr 05 2018 01:03:44 +0000 Subject: treecompose: Ensure we exclude from all repos --- diff --git a/centos-ci/run-treecompose b/centos-ci/run-treecompose index 99b19c4..803fcb8 100755 --- a/centos-ci/run-treecompose +++ b/centos-ci/run-treecompose @@ -52,11 +52,14 @@ pyappendjsonmember() { pyappendjsonmember "repos" '["fahc-rdgo"]' pysetjsonmember "ref" '"'${ref}'"' +# To ensure the build overrides; see also https://github.com/rpm-software-management/libdnf/pull/149 +excludes='exclude=ostree ostree-libs ostree-grub2 rpm-ostree' +for repo in ~/fedora-atomic/*.repo; do + cat ${repo} | (while read line; do if echo "$line" | grep -qE -e '^enabled=1'; then echo "${excludes}"; fi; echo $line; done) > ${repo}.new + mv ${repo}.new ${repo} +done cp ${buildscriptsdir}/fahc-rdgo.repo ~/fedora-atomic/ -# Pull a snapshot of this; TODO use git master? sed -i -e 's,https://ci.centos.org/artifacts/,http://artifacts.ci.centos.org/,g' ~/fedora-atomic/fahc-rdgo.repo -# To ensure the build overrides -echo 'exclude=ostree ostree-libs ostree-grub2 rpm-ostree' >> ~/fedora-atomic/fedora-${vmajor}.repo ostree --repo=repo-build init --mode=bare-user # Do the compose into bare-user for efficiency, we do it as root for now