From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 27 Jan 2025 14:58:53 +0000 (+0000)
Subject: Rename to PBS
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1cacbbcc1b1c1c159d5f03a3be45971d489ae0b6;p=pbs.git

Rename to PBS

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>
---

diff --git a/Makefile.am b/Makefile.am
index 3a3a1b28..4cff09bc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
 
 # ------------------------------------------------------------------------------
 
diff --git a/configure.ac b/configure.ac
index edeb7828..e88806f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,10 +20,11 @@
 
 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])
diff --git a/src/buildservice/constants.py.in b/src/buildservice/constants.py.in
index 4c479ba1..472005c0 100644
--- a/src/buildservice/constants.py.in
+++ b/src/buildservice/constants.py.in
@@ -1,8 +1,5 @@
 #!/usr/bin/python
 
-# Import all constants from the pakfire module.
-from pakfire.constants import *
-
 PACKAGE_NAME = "@PACKAGE_NAME@"
 
 CONFIGSDIR   = "@configsdir@"
diff --git a/src/scripts/pakfire-build-service b/src/scripts/pakfire-build-service
index 097d883a..bb407e81 100644
--- a/src/scripts/pakfire-build-service
+++ b/src/scripts/pakfire-build-service
@@ -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
diff --git a/src/scripts/pakfire-web b/src/scripts/pakfire-web
index 035c8ef3..104852d4 100644
--- a/src/scripts/pakfire-web
+++ b/src/scripts/pakfire-web
@@ -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()