From c2c8ee0085702486ca815829341e53deb5dee720 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 25 Feb 2016 22:00:29 +0000 Subject: [PATCH] Fix bodhi to not point to development/23 anymore, it should use the released repos --- roles/bodhi2/backend/files/f23-updates-testing.mash | 7 ++----- roles/bodhi2/backend/files/f23-updates.mash | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/roles/bodhi2/backend/files/f23-updates-testing.mash b/roles/bodhi2/backend/files/f23-updates-testing.mash index 1c1ca0decd..5e4d23f838 100644 --- a/roles/bodhi2/backend/files/f23-updates-testing.mash +++ b/roles/bodhi2/backend/files/f23-updates-testing.mash @@ -15,8 +15,5 @@ repoviewtitle = "Fedora 23 Updates Testing - %(arch)s" arches = armhfp i386 x86_64 hash_packages = True delta = True -#delta_dirs = /pub/fedora/linux/releases/23/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f23-updates/%(arch)s/ -#parent_repos = http://download.fedoraproject.org/pub/fedora/linux/updates/23/%(arch)s, http://download.fedoraproject.org/pub/fedora/linux/releases/23/Everything/%(arch)s/os -# point to branched till we release then use above -delta_dirs = /pub/fedora/linux/development/23/%(arch)s/os/ -parent_repos = http://download.fedoraproject.org/pub/fedora/linux/development/23/%(arch)s/os/ +delta_dirs = /pub/fedora/linux/releases/23/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f23-updates/%(arch)s/ +parent_repos = http://download.fedoraproject.org/pub/fedora/linux/updates/23/%(arch)s, http://download.fedoraproject.org/pub/fedora/linux/releases/23/Everything/%(arch)s/os diff --git a/roles/bodhi2/backend/files/f23-updates.mash b/roles/bodhi2/backend/files/f23-updates.mash index 05b8031396..b2061e07a7 100644 --- a/roles/bodhi2/backend/files/f23-updates.mash +++ b/roles/bodhi2/backend/files/f23-updates.mash @@ -13,8 +13,5 @@ repoviewtitle = "Fedora 23 Updates - %(arch)s" arches = armhfp i386 x86_64 hash_packages = True delta = True -#generate deltas against branched -delta_dirs = /pub/fedora/linux/development/23/%(arch)s/os/,/mnt/koji/mash/updates/f23-updates/%(arch)s/ -parent_repos = http://download.fedoraproject.org/pub/fedora/linux/development/23/%(arch)s/os -#delta_dirs = /pub/fedora/linux/releases/23/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f23-updates/%(arch)s/ -#parent_repos = http://download.fedoraproject.org/pub/fedora/linux/releases/23/Everything/%(arch)s/os +delta_dirs = /pub/fedora/linux/releases/23/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f23-updates/%(arch)s/ +parent_repos = http://download.fedoraproject.org/pub/fedora/linux/releases/23/Everything/%(arch)s/os