mock needs to be forced to use priorities. :-(

diff --git a/fed-16-x86_64.cfg.template b/fed-16-x86_64.cfg.template
index 3979737..af17c99 100644 (file)
--- a/fed-16-x86_64.cfg.template
+++ b/fed-16-x86_64.cfg.template
@@ -5,6 +5,7 @@ config_opts['chroot_setup_cmd'] = 'install @buildsys-build yum-plugin-priorities
 config_opts['dist'] = 'fc16'  # only useful for --resultdir variable subst
 config_opts['macros']['%__arch_install_post'] = '%{nil}'
 
+config_opts['priorities.conf'] = '\n[main]\nenabled=1'
 config_opts['yum.conf'] = """
 [main]
 cachedir=/var/cache/yum

diff --git a/fed-17-x86_64.cfg.template b/fed-17-x86_64.cfg.template
index 8286e01..b7f7b27 100644 (file)
--- a/fed-17-x86_64.cfg.template
+++ b/fed-17-x86_64.cfg.template
@@ -5,6 +5,7 @@ config_opts['chroot_setup_cmd'] = 'install @buildsys-build yum-plugin-priorities
 config_opts['dist'] = 'fc17'  # only useful for --resultdir variable subst
 config_opts['macros']['%__arch_install_post'] = '%{nil}'
 
+config_opts['priorities.conf'] = '\n[main]\nenabled=1'
 config_opts['yum.conf'] = """
 [main]
 cachedir=/var/cache/yum

diff --git a/fed-18-i386.cfg.template b/fed-18-i386.cfg.template
index 73ee3da..7bd4eca 100644 (file)
--- a/fed-18-i386.cfg.template
+++ b/fed-18-i386.cfg.template
@@ -4,6 +4,7 @@ config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build yum-plugin-priorities yum-plugin-protectbase'
 config_opts['dist'] = 'fc18'  # only useful for --resultdir variable subst
 
+config_opts['priorities.conf'] = '\n[main]\nenabled=1'
 config_opts['yum.conf'] = """
 [main]
 cachedir=/var/cache/yum

diff --git a/fed-18-x86_64.cfg.template b/fed-18-x86_64.cfg.template
index eeb4298..e5aeb99 100644 (file)
--- a/fed-18-x86_64.cfg.template
+++ b/fed-18-x86_64.cfg.template
@@ -4,6 +4,7 @@ config_opts['legal_host_arches'] = ('x86_64',)
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build yum-plugin-priorities yum-plugin-protectbase'
 config_opts['dist'] = 'fc18'  # only useful for --resultdir variable subst
 
+config_opts['priorities.conf'] = '\n[main]\nenabled=1'
 config_opts['yum.conf'] = """
 [main]
 cachedir=/var/cache/yum

diff --git a/fed-19-i386.cfg.template b/fed-19-i386.cfg.template
index 59518f7..41cee59 100644 (file)
--- a/fed-19-i386.cfg.template
+++ b/fed-19-i386.cfg.template
@@ -4,6 +4,7 @@ config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build yum-plugin-priorities yum-plugin-protectbase'
 config_opts['dist'] = 'fc19'  # only useful for --resultdir variable subst
 
+config_opts['priorities.conf'] = '\n[main]\nenabled=1'
 config_opts['yum.conf'] = """
 [main]
 cachedir=/var/cache/yum

diff --git a/fed-19-x86_64.cfg.template b/fed-19-x86_64.cfg.template
index 4d35ac9..41c8f11 100644 (file)
--- a/fed-19-x86_64.cfg.template
+++ b/fed-19-x86_64.cfg.template
@@ -4,6 +4,7 @@ config_opts['legal_host_arches'] = ('x86_64',)
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build yum-plugin-priorities yum-plugin-protectbase'
 config_opts['dist'] = 'fc19'  # only useful for --resultdir variable subst
 
+config_opts['priorities.conf'] = '\n[main]\nenabled=1'
 config_opts['yum.conf'] = """
 [main]
 cachedir=/var/cache/yum

diff --git a/sl-5-i386.cfg.template b/sl-5-i386.cfg.template
index b174022..ec3caa7 100644 (file)
--- a/sl-5-i386.cfg.template
+++ b/sl-5-i386.cfg.template
@@ -8,6 +8,7 @@ config_opts['macros']['%dist'] = '.el5'
 config_opts['macros']['%el5'] = '1'
 config_opts['macros']['%rhel'] = '5'
 
+config_opts['priorities.conf'] = '\n[main]\nenabled=1'
 config_opts['yum.conf'] = """
 [main]
 cachedir=/var/cache/yum

diff --git a/sl-5-x86_64.cfg.template b/sl-5-x86_64.cfg.template
index 3311b26..91a3d76 100644 (file)
--- a/sl-5-x86_64.cfg.template
+++ b/sl-5-x86_64.cfg.template
@@ -8,6 +8,7 @@ config_opts['macros']['%dist'] = '.el5'
 config_opts['macros']['%el5'] = '1'
 config_opts['macros']['%rhel'] = '5'
 
+config_opts['priorities.conf'] = '\n[main]\nenabled=1'
 config_opts['yum.conf'] = """
 [main]
 cachedir=/var/cache/yum

diff --git a/sl-6-i386.cfg.template b/sl-6-i386.cfg.template
index cecec4d..64cf178 100644 (file)
--- a/sl-6-i386.cfg.template
+++ b/sl-6-i386.cfg.template
@@ -5,6 +5,7 @@ config_opts['chroot_setup_cmd'] = 'install @buildsys-build yum-plugin-priorities
 config_opts['dist'] = 'el6'  # only useful for --resultdir variable subst
 config_opts['macros']['%__arch_install_post'] = '%{nil}'
 
+config_opts['priorities.conf'] = '\n[main]\nenabled=1'
 config_opts['yum.conf'] = """
 [main]
 cachedir=/var/cache/yum

diff --git a/sl-6-x86_64.cfg.template b/sl-6-x86_64.cfg.template
index e9102c2..0966c9e 100644 (file)
--- a/sl-6-x86_64.cfg.template
+++ b/sl-6-x86_64.cfg.template
@@ -5,6 +5,7 @@ config_opts['chroot_setup_cmd'] = 'install @buildsys-build yum-plugin-priorities
 config_opts['dist'] = 'el6'  # only useful for --resultdir variable subst
 config_opts['macros']['%__arch_install_post'] = '%{nil}'
 
+config_opts['priorities.conf'] = '\n[main]\nenabled=1'
 config_opts['yum.conf'] = """
 [main]
 cachedir=/var/cache/yum