From 485d58a1f9fe960dfce968eb45b6b0941b064fe8 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 6 Jun 2016 12:27:36 +0200 Subject: [PATCH] Update koschei-refresh-group to work with both repo layouts --- roles/koschei/backend/files/koschei-refresh-group | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/koschei/backend/files/koschei-refresh-group b/roles/koschei/backend/files/koschei-refresh-group index 70faa27987..0c89ef5b7e 100644 --- a/roles/koschei/backend/files/koschei-refresh-group +++ b/roles/koschei/backend/files/koschei-refresh-group @@ -4,8 +4,8 @@ if [ "$#" -lt 2 ]; then exit 1 fi set -e -repodata=`find /var/cache/koschei/repodata/ -maxdepth 1 -type d -name 'primary-f*' | sort -nr | head -n1` -repoid=`basename $repodata` +repodata=`find /var/cache/koschei/repodata/ -path '*/primary-f*' -name repomd.xml | sort -nr | head -n1` +repoid=`grep -o 'primary-[^/]*' <<< "$repodata"` group=$1 shift -dnf repoquery --repofrompath "$repoid,$repodata/x86_64" --disablerepo \* --enablerepo "$repoid" --repoid "$repoid" --srpm --qf '%{name}' "$@" | koschei-admin edit-group "$group" --content-from-file - --append +dnf repoquery --repofrompath "$repoid,$repodata" --disablerepo \* --enablerepo "$repoid" --repoid "$repoid" --srpm --qf '%{name}' "$@" | koschei-admin edit-group "$group" --content-from-file - --append