[flatpaks/flatpak-runtime] f45: Remove obsolete module handling

[flatpaks/flatpak-runtime] f45: Remove obsolete module handling

[Owen W. Taylor]

A new commit has been pushed.

Repo   : flatpaks/flatpak-runtime
Branch : f45
Commit : dd57145de58f3d2a673ed3fce19db6d4464dabf9
Author : Owen W. Taylor <otaylor@fishsoup.net>
Date   : 2020-03-20T21:51:58+01:00
Stats  : +2/-53 in 3 file(s)
URL    : https://src.fedoraproject.org/flatpaks/flatpak-runtime/c/dd57145de58f3d2a673ed3fce19db6d4464dabf9?branch=f45

Log:
Remove obsolete module handling

---
diff --git a/reports/report.css b/reports/report.css
index 80fe6a7..b7795dd 100644
--- a/reports/report.css
+++ b/reports/report.css
@@ -93,12 +93,6 @@ tr {
 tr.source-package {
     background: #eeeeee;
 }
-tr.build-sdk, td.build-sdk {
-    background: #eef8dd;
-}
-tr.build-platform, td.build-platform {
-    background: #f8eedd;
-}
 td.build-sdk, td.build-platform {
     border: 1px solid black;
 }

diff --git a/runtime-template.html b/runtime-template.html
index 2fa1dc3..cfb6266 100644
--- a/runtime-template.html
+++ b/runtime-template.html
@@ -31,8 +31,6 @@
 	<tr><td>FD/S</td><td> - org.freedesktop.Sdk</td></tr>
 	<tr><td>GN/S</td><td> - org.gnome.Sdk</td></tr>
 	<tr><td>LIVE</td><td> - F27 live image</td></tr>
-	<tr><td class="build-platform"></td><td> - Build in desktop-runtime module</td></tr>
-	<tr><td class="build-sdk"></td><td> - Build in flatpak-runtime module</td></tr>
 	<tr><td class="root"></td><td> - Root package, only included because of files in runtime</td></tr>
 	<tr><td class="files"></td><td> - Included because of files in runtime, also depended upon</td></tr>
 	<tr><td class="dep"></td><td> - Included because of dependencies</td></tr>

diff --git a/tools/generate-runtime-report.py b/tools/generate-runtime-report.py
index 9f16499..ee0fa24 100755
--- a/tools/generate-runtime-report.py
+++ b/tools/generate-runtime-report.py
@@ -86,10 +86,6 @@ class Package(object):
         return klass
 
     @property
-    def modules(self):
-        return package_to_module.get(self.name, "")
-
-    @property
     def note(self):
         if self._note:
             return self._note
@@ -182,40 +178,12 @@ class SourcePackage(object):
         self.packages = []
 
     @property
-    def modules(self):
-        old_modules = self.packages[0].modules
-        klass = self.klass
-        if klass == "build-platform":
-            new_module = "desktop-runtime"
-        elif klass == "build-sdk":
-            new_module = "flatpak-runtime"
-        else:
-            new_module = None
-
-        if old_modules and new_module:
-            return old_modules + " ⇒ " + new_module
-        elif old_modules:
-            return old_modules
-        else:
-            return new_module
-
-    @property
     def sdk_only(self):
         return sdk_only
 
     @property
     def klass(self):
-        if self.packages[0].modules in ("", "installer"):
-            sdk_only = True
-            for package in self.packages:
-                if package.freedesktop_platform or package.gnome_platform:
-                    sdk_only = False
-            if sdk_only:
-                return "build-sdk"
-            else:
-                return "build-platform"
-        else:
-            return ""
+        return ""
 
     @property
     def devel_missing(self):
@@ -395,17 +363,6 @@ for k in sorted(letters_map.keys()):
     letter.packages.sort(key=lambda p: locale.strxfrm(p.name))
     letters.append(letter)
 
-start("Loading package to module map")
-package_to_module = dict()
-
-output = fedmod_output(['list-rpms', '--list-modules'])
-for l in output.split('\n'):
-    fields = l.strip().split()
-    if len(fields) != 2:
-        continue
-    package_to_module[fields[0]] = fields[1][1:-1]
-done()
-
 # Add package notes to packages
 for name, note, flag in read_package_notes():
     pkg = packages.get(name, None)
@@ -463,4 +420,4 @@ env = Environment(
 template = env.get_template('runtime-template.html')
 
 with open('reports/runtime.html', 'w') as f:
-    f.write(template.render(letters=letters, unmatched=unmatched_counts, package_to_module=package_to_module))
+    f.write(template.render(letters=letters, unmatched=unmatched_counts))