]> git.ipfire.org Git - pbs.git/commitdiff
Rename to PBS
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 27 Jan 2025 14:58:53 +0000 (14:58 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 27 Jan 2025 14:58:53 +0000 (14:58 +0000)
This is easier than a hyphenated Python package name. This is now also
moved out of the pakfire module which has become a pure C module.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Makefile.am
configure.ac
src/buildservice/constants.py.in
src/scripts/pakfire-build-service
src/scripts/pakfire-web

index 3a3a1b28f84ae1eb9f0f1ba8e5b0b329b27f9e65..4cff09bcbb74c3618644189878fdde10e5d9aea0 100644 (file)
@@ -30,10 +30,9 @@ AUTOMAKE_OPTIONS = color-tests
 
 SUBDIRS = . po
 
-pythondir  = $(pyexecdir)/pakfire
-
 configsdir = $(sysconfdir)/pakfire
 crondir = $(sysconfdir)/cron.d
+pythondir = /usr/lib/python3/dist-packages
 
 BUILT_SOURCES =
 CLEANFILES =
@@ -78,7 +77,7 @@ dist_bin_SCRIPTS = \
 dist_configs_DATA = \
        pbs.conf.sample
 
-buildservice_PYTHON = \
+pkgpython_PYTHON = \
        src/buildservice/__init__.py \
        src/buildservice/__version__.py \
        src/buildservice/aws.py \
@@ -112,8 +111,6 @@ buildservice_PYTHON = \
        src/buildservice/uploads.py \
        src/buildservice/users.py
 
-buildservicedir = $(pythondir)/buildservice
-
 BUILT_SOURCES += \
        src/buildservice/constants.py
 
@@ -144,7 +141,7 @@ web_PYTHON = \
        src/web/uploads.py \
        src/web/users.py
 
-webdir = $(buildservicedir)/web
+webdir = $(pkgpythondir)/web
 
 # ------------------------------------------------------------------------------
 
index edeb78282f09055f91fe695e0ba448c98ca2563c..e88806f809d5dba82c8460ad49a58db29605729e 100644 (file)
 
 AC_PREREQ([2.64])
 
-AC_INIT([pakfire-build-service],
+AC_INIT(
+       [pbs],
        [2017.01],
        [info@ipfire.org],
-       [pakfire-build-service],
+       [pbs],
        [https://git.ipfire.org/?p=pbs.git;a=summary])
 
 AC_CONFIG_MACRO_DIR([m4])
index 4c479ba13fccc36df1235db6ea6ffc676b3020d8..472005c0add7615fa7ad4dd23f451f4c6728633d 100644 (file)
@@ -1,8 +1,5 @@
 #!/usr/bin/python
 
-# Import all constants from the pakfire module.
-from pakfire.constants import *
-
 PACKAGE_NAME = "@PACKAGE_NAME@"
 
 CONFIGSDIR   = "@configsdir@"
index 097d883a581ee2bb3fd48ac84af953b18a09889b..bb407e81f4ece49832d0f7c964599c20c8dbed44 100644 (file)
@@ -1,18 +1,17 @@
 #!/usr/bin/python3
 
 import asyncio
+import pbs
 import sys
 
 # Use tornado's logging options
 import tornado.options
 tornado.options.parse_command_line()
 
-import pakfire.buildservice
-
 class Cli(object):
        def __init__(self, *args, **kwargs):
                # Initialise backend
-               self.backend = pakfire.buildservice.Backend("/etc/pakfire/pbs.conf")
+               self.backend = pbs.Backend("/etc/pakfire/pbs.conf")
 
                self._commands = {
                        # Bugzilla
index 035c8ef3469863923f01753caaa803508dc8c826..104852d4374a05bf9ff93c105596393f0be30405 100644 (file)
@@ -1,17 +1,16 @@
 #!/usr/bin/python3
 
 import asyncio
+import pbs.web
 import tornado.options
 
-import pakfire.buildservice.web
-
 tornado.options.define("port", type=int, default=9000, help="Port to listen on")
 
 async def main():
        tornado.options.parse_command_line()
 
        # Initialise application
-       app = pakfire.buildservice.web.Application()
+       app = pbs.web.Application()
 
        # Check the database schema
        #await app.backend.db.check_schema()