[PATCH] yumbase._getConfig() doesn't take any arguments, use yumbase.preconf to set yum up.

[Jeffrey Ollie]

Signed-off-by: Jeffrey C. Ollie <jeff(a)ocjtech.us&gt;
---
 builder/mergerepos |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/builder/mergerepos b/builder/mergerepos
index 4243444..defb8c1 100755
--- a/builder/mergerepos
+++ b/builder/mergerepos
@@ -95,7 +95,10 @@ class RepoMerge(object):
         self.mdconf.verbose = True
         self.mdconf.changelog_limit = 3
         self.yumbase = yum.YumBase()
-        self.yumbase._getConfig('/dev/null', init_plugins=False, debuglevel=2)
+        self.yumbase.preconf.fn = '/dev/null'
+        self.yumbase.preconf.init_plugins = False
+        self.yumbase.preconf.debuglevel = 2
+        self.yumbase._getConfig()
         self.yumbase.conf.cachedir = tempfile.mkdtemp()
         self.yumbase.conf.cache = 0
         self.archlist = arches
-- 
1.6.0.6

[PATCH] Add compatibility back in for older versions of Yum.

[Jeffrey Ollie]

We would like for Koji to remain compatible with the version of Yum
that is shipped with RHEL 5.

Signed-off-by: Jeffrey C. Ollie <jeff(a)ocjtech.us&gt;
---
 builder/mergerepos |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/builder/mergerepos b/builder/mergerepos
index defb8c1..cfa3a8d 100755
--- a/builder/mergerepos
+++ b/builder/mergerepos
@@ -95,10 +95,13 @@ class RepoMerge(object):
         self.mdconf.verbose = True
         self.mdconf.changelog_limit = 3
         self.yumbase = yum.YumBase()
-        self.yumbase.preconf.fn = '/dev/null'
-        self.yumbase.preconf.init_plugins = False
-        self.yumbase.preconf.debuglevel = 2
-        self.yumbase._getConfig()
+        if hasattr(self.yumbase, 'preconf'):
+            self.yumbase.preconf.fn = '/dev/null'
+            self.yumbase.preconf.init_plugins = False
+            self.yumbase.preconf.debuglevel = 2
+            self.yumbase._getConfig()
+        else:
+            self.yumbase._getConfig('/dev/null', init_plugins=False,
debuglevel=2)
         self.yumbase.conf.cachedir = tempfile.mkdtemp()
         self.yumbase.conf.cache = 0
         self.archlist = arches
-- 
1.6.0.6

[PATCH] Add compatibility back in for older versions of Yum.

[Mike Bonnet]

Jeffrey C. Ollie wrote:
>  We would like for Koji to remain compatible with the version of Yum
>  that is shipped with RHEL 5.
>  
>  Signed-off-by: Jeffrey C. Ollie <jeff(a)ocjtech.us&gt;
>  ---
>   builder/mergerepos |   11 +++++++----
>   1 files changed, 7 insertions(+), 4 deletions(-)
>  
>  diff --git a/builder/mergerepos b/builder/mergerepos
>  index defb8c1..cfa3a8d 100755
>  --- a/builder/mergerepos
>  +++ b/builder/mergerepos
>  @@ -95,10 +95,13 @@ class RepoMerge(object):
>           self.mdconf.verbose = True
>           self.mdconf.changelog_limit = 3
>           self.yumbase = yum.YumBase()
>  -        self.yumbase.preconf.fn = '/dev/null'
>  -        self.yumbase.preconf.init_plugins = False
>  -        self.yumbase.preconf.debuglevel = 2
>  -        self.yumbase._getConfig()
>  +        if hasattr(self.yumbase, 'preconf'):
>  +            self.yumbase.preconf.fn = '/dev/null'
>  +            self.yumbase.preconf.init_plugins = False
>  +            self.yumbase.preconf.debuglevel = 2
>  +            self.yumbase._getConfig()
>  +        else:
>  +            self.yumbase._getConfig('/dev/null', init_plugins=False,
> debuglevel=2)
>           self.yumbase.conf.cachedir = tempfile.mkdtemp()
>           self.yumbase.conf.cache = 0
>           self.archlist = arches 
Applied, thanks for the patch!

[PATCH] Add compatibility back in for older versions of Yum.

[James Antill]

On Tue, 2009-02-17 at 10:29 -0600, Jeffrey C. Ollie wrote:
>  We would like for Koji to remain compatible with the version of Yum
>  that is shipped with RHEL 5.
>  
>  Signed-off-by: Jeffrey C. Ollie <jeff(a)ocjtech.us&gt;
>  ---
>   builder/mergerepos |   11 +++++++----
>   1 files changed, 7 insertions(+), 4 deletions(-)
>  
>  diff --git a/builder/mergerepos b/builder/mergerepos
>  index defb8c1..cfa3a8d 100755
>  --- a/builder/mergerepos
>  +++ b/builder/mergerepos
>  @@ -95,10 +95,13 @@ class RepoMerge(object):
>           self.mdconf.verbose = True
>           self.mdconf.changelog_limit = 3
>           self.yumbase = yum.YumBase()
>  -        self.yumbase.preconf.fn = '/dev/null'
>  -        self.yumbase.preconf.init_plugins = False
>  -        self.yumbase.preconf.debuglevel = 2
>  -        self.yumbase._getConfig()
>  +        if hasattr(self.yumbase, 'preconf'):
>  +            self.yumbase.preconf.fn = '/dev/null'
>  +            self.yumbase.preconf.init_plugins = False
>  +            self.yumbase.preconf.debuglevel = 2
>  +            self.yumbase._getConfig() 
 This line should be deleted, the first line after the if will turn the
preconf into the conf.

>  +        else:
>  +            self.yumbase._getConfig('/dev/null', init_plugins=False,
> debuglevel=2)
>           self.yumbase.conf.cachedir = tempfile.mkdtemp()
>           self.yumbase.conf.cache = 0
>           self.archlist = arches 
-- 
James Antill <james(a)fedoraproject.org&gt;
Fedora

[PATCH] Add compatibility back in for older versions of Yum.

[Mike Bonnet]

James Antill wrote:
>  On Tue, 2009-02-17 at 10:29 -0600, Jeffrey C. Ollie wrote:
> > We would like for Koji to remain compatible with the version of Yum
> > that is shipped with RHEL 5.
> >
> > Signed-off-by: Jeffrey C. Ollie <jeff(a)ocjtech.us&gt;
> > ---
> >  builder/mergerepos |   11 +++++++----
> >  1 files changed, 7 insertions(+), 4 deletions(-)
> >
> > diff --git a/builder/mergerepos b/builder/mergerepos
> > index defb8c1..cfa3a8d 100755
> > --- a/builder/mergerepos
> > +++ b/builder/mergerepos
> > @@ -95,10 +95,13 @@ class RepoMerge(object):
> >          self.mdconf.verbose = True
> >          self.mdconf.changelog_limit = 3
> >          self.yumbase = yum.YumBase()
> > -        self.yumbase.preconf.fn = '/dev/null'
> > -        self.yumbase.preconf.init_plugins = False
> > -        self.yumbase.preconf.debuglevel = 2
> > -        self.yumbase._getConfig()
> > +        if hasattr(self.yumbase, 'preconf'):
> > +            self.yumbase.preconf.fn = '/dev/null'
> > +            self.yumbase.preconf.init_plugins = False
> > +            self.yumbase.preconf.debuglevel = 2
> > +            self.yumbase._getConfig()
>  
>   This line should be deleted, the first line after the if will turn the
>  preconf into the conf. 
Thanks, I've made that change.

> > +        else:
> > +            self.yumbase._getConfig('/dev/null', init_plugins=False,
> debuglevel=2)
> >          self.yumbase.conf.cachedir = tempfile.mkdtemp()
> >          self.yumbase.conf.cache = 0
> >          self.archlist = arches