Rename main object from Pakfire to Backend

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/buildservice/__init__.py b/src/buildservice/__init__.py
index d1ef4bbf3967662c99c47675700f5838e8bf8cd0..ad2790a6dac412cb1790bcf9def9d3b156bb5c31 100644 (file)
--- a/src/buildservice/__init__.py
+++ b/src/buildservice/__init__.py
@@ -29,7 +29,7 @@ from . import users
 
 from .constants import *
 
-class Pakfire(object):
+class Backend(object):
        def __init__(self, config_file="pbs.conf"):
                # Read configuration file.
                self.config = self.read_config(config_file)

diff --git a/src/buildservice/scheduler.py b/src/buildservice/scheduler.py
index 3151dc53ea0c1a5231c6ca0152c3533946c8b7d8..1274be6fc7a557bf3e68e1b713046b54fd9322db 100644 (file)
--- a/src/buildservice/scheduler.py
+++ b/src/buildservice/scheduler.py
@@ -5,7 +5,7 @@ import multiprocessing
 import time
 import traceback
 
-from . import Pakfire
+from . import Backend
 
 class Event(object):
        interval = None
@@ -50,9 +50,9 @@ class Event(object):
        @staticmethod
        def fork(method, *args, **kwargs):
                # Create new pakfire instance.
-               _pakfire = Pakfire()
+               backend = Backend()
 
-               return method(_pakfire, *args, **kwargs)
+               return method(backend, *args, **kwargs)
 
 
 class Scheduler(object):

diff --git a/src/hub/__init__.py b/src/hub/__init__.py
index 3f90935355d8da9a185ae2e9dea5c5c7acd77a7b..849208d55302ba65d6ce9bd18aa5db414e09b0d4 100644 (file)
--- a/src/hub/__init__.py
+++ b/src/hub/__init__.py
@@ -7,7 +7,7 @@ import tornado.locale
 import tornado.options
 import tornado.web
 
-from .. import Pakfire
+from .. import Backend
 
 from . import handlers
 
@@ -82,7 +82,7 @@ class Application(tornado.web.Application):
                if self.__pakfire is None:
                        config_file = os.path.join(BASEDIR, "..", "pbs.conf")
 
-                       self.__pakfire = Pakfire(config_file=config_file)
+                       self.__pakfire = Backend(config_file=config_file)
 
                return self.__pakfire
 

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 7697ece284b2d510d7b5f59c5c95a48fea985926..d077714c06a7f0eefe249fb701afe2028944c99d 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -9,6 +9,8 @@ import tornado.locale
 import tornado.options
 import tornado.web
 
+from .. import Backend
+
 from . import handlers_api
 
 from .handlers import *
@@ -261,7 +263,7 @@ class Application(tornado.web.Application):
                if self.__pakfire is None:
                        config_file = os.path.join(BASEDIR, "..", "pbs.conf")
 
-                       self.__pakfire = backend.Pakfire(config_file=config_file)
+                       self.__pakfire = Backend(config_file=config_file)
 
                return self.__pakfire