packages: Rename maintainers to packagers

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

diff --git a/src/buildservice/packages.py b/src/buildservice/packages.py
index e821800bdb2a47ddea3ef349d2042cc643b608b5..322b83e67f43d7ccc28eca5757b2575e96d564c8 100644 (file)
--- a/src/buildservice/packages.py
+++ b/src/buildservice/packages.py
@@ -112,7 +112,7 @@ class Packages(base.Object):
                                uuid,
                                groups,
                                distro_id,
-                               maintainer,
+                               packager,
                                license,
                                url,
                                summary,
@@ -145,7 +145,7 @@ class Packages(base.Object):
                        package.uuid,
                        "", #package.groups, # SEGV
                        distro,
-                       package.maintainer,
+                       package.packager,
                        package.license,
                        package.url,
                        package.summary,
@@ -287,8 +287,8 @@ class Package(base.DataObject):
                return self.data.groups.split()
 
        @lazy_property
-       def maintainer(self):
-               return self.backend.users.get_by_email(self.data.maintainer) or self.data.maintainer
+       def packager(self):
+               return self.backend.users.get_by_email(self.data.packager) or self.data.packager
 
        @property
        def license(self):

diff --git a/src/database.sql b/src/database.sql
index 417c78e854dd70ef452e6a2ca228d82bd4597ed9..f6199208197ad0ba251f83d9ad987abe7a681d51 100644 (file)
--- a/src/database.sql
+++ b/src/database.sql
@@ -639,7 +639,7 @@ CREATE TABLE public.packages (
     evr text NOT NULL,
     arch text NOT NULL,
     groups text NOT NULL,
-    maintainer text,
+    packager text,
     license text NOT NULL,
     url text NOT NULL,
     summary text NOT NULL,

diff --git a/src/hub/handlers.py b/src/hub/handlers.py
index 340afec94467c43528c16af0b88991c7687feeaf..9945d9aeda1ea39eefac68673f6d7f09f6fdeb30 100644 (file)
--- a/src/hub/handlers.py
+++ b/src/hub/handlers.py
@@ -273,11 +273,6 @@ class PackagesGetHandler(BaseHandler):
                if pkg.type == "source":
                        ret["supported_arches"] = pkg.supported_arches
 
-               if isinstance(pkg.maintainer, users.User):
-                       ret["maintainer"] = "%s <%s>" % (pkg.maintainer.realname, pkg.maintainer.email)
-               elif pkg.maintainer:
-                       ret["maintainer"] = pkg.maintainer
-
                if pkg.distro:
                        ret["distro"] = pkg.distro.slug
 

diff --git a/src/templates/packages/modules/info.html b/src/templates/packages/modules/info.html
index 323aad7cc0a6cea11d7e8761f53b1fde36f06f7b..d40ff81e1451bf6bd3d30745b4cf66af7d7d4346 100644 (file)
--- a/src/templates/packages/modules/info.html
+++ b/src/templates/packages/modules/info.html
@@ -54,13 +54,13 @@
                                        </div>
                                {% end %}
 
-                               {# Maintainer #}
-                               {% if package.maintainer %}
+                               {# Packager #}
+                               {% if package.packager %}
                                        <div class="level-item has-text-centered">
                                                <div>
-                                                       <p class="heading">{{ _("Maintainer") }}</p>
+                                                       <p class="heading">{{ _("Packager") }}</p>
                                                        <p>
-                                                               {% module LinkToUser(package.maintainer) %}
+                                                               {% module LinkToUser(package.packager) %}
                                                        </p>
                                                </div>
                                        </div>

diff --git a/tests/package.py b/tests/package.py
index 9024ada7bbed17728ea586de92e5d693626cd1a5..6e874bf80a6382b70728095193ad7d098a5a4d8a 100755 (executable)
--- a/tests/package.py
+++ b/tests/package.py
@@ -32,7 +32,7 @@ class PackageTestCase(test.TestCase):
                self.assertEqual(package.evr, "1.3-2.ip3")
                self.assertEqual(package.arch, "x86_64")
                self.assertEqual(package.groups, [])
-               self.assertEqual(package.maintainer, None)
+               self.assertEqual(package.packager, None)
                self.assertEqual(package.license, "GPLv2+")
                self.assertEqual(package.url, "http://www.johnath.com/beep/")
                self.assertEqual(package.summary, "Beep the PC speaker any number of ways.")