[PATCH] Don't hardcode /var/lib/mock

[Mathieu Bridon]

The builder configuration allows setting this to a different folder.
---
 koji/daemon.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/koji/daemon.py b/koji/daemon.py
index fa22d5a..4f4b575 100644
--- a/koji/daemon.py
+++ b/koji/daemon.py
@@ -651,7 +651,7 @@ class TaskManager(object):
             if id is None or name is None:
                 continue
             # see if there's a dir for the buildroot
-            vardir = "/var/lib/mock/%s" % name
+            vardir = os.path.join(self.options.mockdir, name)
             #XXX
             buildroots[id] = {}
             buildroots[id]['name'] = name
-- 
1.8.4.2

[Mathieu Bridon]

Anyone?


-- 
Mathieu

On Wed, 2014-01-29 at 17:56 +0800, Mathieu Bridon wrote:
>  The builder configuration allows setting this to a different folder.
>  ---
>   koji/daemon.py | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>  
>  diff --git a/koji/daemon.py b/koji/daemon.py
>  index fa22d5a..4f4b575 100644
>  --- a/koji/daemon.py
>  +++ b/koji/daemon.py
>  @@ -651,7 +651,7 @@ class TaskManager(object):
>               if id is None or name is None:
>                   continue
>               # see if there's a dir for the buildroot
>  -            vardir = "/var/lib/mock/%s" % name
>  +            vardir = os.path.join(self.options.mockdir, name)
>               #XXX
>               buildroots[id] = {}
>               buildroots[id]['name'] = name

[Jon]

I agree with this in principle.
mock can be configured to put chroots anywhere, so it makes sense to
NOT assume /var/lib/mock.

ack

On Tue, Feb 4, 2014 at 10:41 PM, Mathieu Bridon
<bochecha(a)fedoraproject.org&gt; wrote:
>  Anyone?
>
>
>  --
>  Mathieu
>
>  On Wed, 2014-01-29 at 17:56 +0800, Mathieu Bridon wrote:
> > The builder configuration allows setting this to a different folder.
> > ---
> >  koji/daemon.py | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/koji/daemon.py b/koji/daemon.py
> > index fa22d5a..4f4b575 100644
> > --- a/koji/daemon.py
> > +++ b/koji/daemon.py
> > @@ -651,7 +651,7 @@ class TaskManager(object):
> >              if id is None or name is None:
> >                  continue
> >              # see if there's a dir for the buildroot
> > -            vardir = "/var/lib/mock/%s" % name
> > +            vardir = os.path.join(self.options.mockdir, name)
> >              #XXX
> >              buildroots[id] = {}
> >              buildroots[id]['name'] = name
>
>
>
>  --
>  buildsys mailing list
>  buildsys(a)lists.fedoraproject.org
>  https://admin.fedoraproject.org/mailman/listinfo/buildsys 


-- 

-Jon

[Mike McLean]

On 01/29/2014 04:56 AM, Mathieu Bridon wrote:
>  The builder configuration allows setting this to a different folder.
>  ---
>   koji/daemon.py | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>  
>  diff --git a/koji/daemon.py b/koji/daemon.py
>  index fa22d5a..4f4b575 100644
>  --- a/koji/daemon.py
>  +++ b/koji/daemon.py
>  @@ -651,7 +651,7 @@ class TaskManager(object):
>               if id is None or name is None:
>                   continue
>               # see if there's a dir for the buildroot
>  -            vardir = "/var/lib/mock/%s" % name
>  +            vardir = os.path.join(self.options.mockdir, name)
>               #XXX
>               buildroots[id] = {}
>               buildroots[id]['name'] = name
>   
Thanks. We should have fixed that when we refactored the daemon code.

Fedorahosted is giving me trouble atm, but I'll push this upstream shortly.