public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Owen W. Taylor <otaylor@fishsoup.net>
To: git-commits@fedoraproject.org
Subject: [flatpaks/flatpak-runtime] f45: Remove filtering, only display packages in some runtime
Date: Fri, 11 Sep 2026 14:40:09 GMT [thread overview]
Message-ID: <178913760919.1.8312106956489200447.flatpaks-flatpak-runtime-fb08efc7f0b4@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : flatpaks/flatpak-runtime
Branch : f45
Commit : fb08efc7f0b406ee9dfb2072d7591e00869373c5
Author : Owen W. Taylor <otaylor@fishsoup.net>
Date : 2018-01-31T11:21:01+01:00
Stats : +9/-45 in 2 file(s)
URL : https://src.fedoraproject.org/flatpaks/flatpak-runtime/c/fb08efc7f0b406ee9dfb2072d7591e00869373c5?branch=f45
Log:
Remove filtering, only display packages in some runtime
The ability to display packages that are just on the Live CD or just
in the F26 runtime didn't seem useful, was a bit confusing, and made
it harder to add other features (namely, grouping by SRPM).
---
diff --git a/generate-report.py b/generate-report.py
index fcd2a2f..d00dd90 100755
--- a/generate-report.py
+++ b/generate-report.py
@@ -118,15 +118,17 @@ class Letter(object):
#
packages = dict()
-def add_package(name, which, level):
+def add_package(name, which, level, only_if_exists):
pkg = packages.get(name, None)
if pkg is None:
+ if only_if_exists:
+ return
pkg = Package(name)
packages[name] = pkg
if getattr(pkg, which) < level:
setattr(pkg, which, level)
-def add_packages(filename, which, resolve_deps=False):
+def add_packages(filename, which, resolve_deps=False, only_if_exists=False):
start("Adding packages from {}".format(filename))
with open(filename) as f:
pkgs = set(line.strip() for line in f)
@@ -136,7 +138,7 @@ def add_packages(filename, which, resolve_deps=False):
for package in resolved_packages:
name = nvr_to_name(package['rpm'])
srpm_name = nvr_to_name(package['srpm'])
- add_package(name, which, level=(2 if name in pkgs else 1))
+ add_package(name, which, level=(2 if name in pkgs else 1), only_if_exists=only_if_exists)
for package in resolved_packages:
for req, provider in package['requires'].items():
@@ -151,7 +153,7 @@ def add_packages(filename, which, resolve_deps=False):
required_by.append((nvr_to_name(package['rpm']), req))
else:
for package in pkgs:
- add_package(package, which, level=2)
+ add_package(package, which, level=2, only_if_exists=only_if_exists)
done()
@@ -171,8 +173,8 @@ add_packages('out/freedesktop-Platform.packages', 'freedesktop_platform', resolv
add_packages('out/freedesktop-Sdk.packages', 'freedesktop_sdk', resolve_deps=True)
add_packages('out/gnome-Platform.packages', 'gnome_platform', resolve_deps=True)
add_packages('out/gnome-Sdk.packages', 'gnome_sdk', resolve_deps=True)
-add_packages('f27-live.packages', 'live')
-add_packages('f26-flatpak-runtime.packages', 'rf26')
+add_packages('f27-live.packages', 'live', only_if_exists=True)
+add_packages('f26-flatpak-runtime.packages', 'rf26', only_if_exists=True)
add_package_files('out/freedesktop-Platform.matched', 'freedesktop_platform')
add_package_files('out/freedesktop-Sdk.matched', 'freedesktop_sdk')
diff --git a/report-template.html b/report-template.html
index 410852b..5b97bbf 100644
--- a/report-template.html
+++ b/report-template.html
@@ -2,46 +2,8 @@
<html>
<head>
<link href="report.css" rel="stylesheet">
- <script type="text/javascript">
- var filter_runtimes = true;
- var filter_live = false;
- var filter_rf26 = false;
- var val;
- function filterclick(e) {
- switch (e.target.id) {
- case "filter-runtimes":
- val = filter_runtimes = !filter_runtimes;
- break;
- case "filter-live":
- val = filter_live = !filter_live;
- break;
- case "filter-rf26":
- val = filter_rf26 = !filter_rf26;
- break;
- }
- if (val) {
- e.target.classList.add('button-selected');
- } else {
- e.target.classList.remove('button-selected');
- }
- for (let el of document.querySelectorAll('tr.package')) {
- console.log(el.dataset.inRuntimes, el.dataset.inLive);
- if (filter_runtimes && el.dataset.inRuntimes !== undefined || filter_live && el.dataset.inLive != undefined || filter_rf26 && el.dataset.inRf26 != undefined) {
- el.classList.remove('hidden');
- } else {
- el.classList.add('hidden');
- }
- }
- }
- </script>
</head>
<body>
- <div class="filter">
- <div>show packages in:</div>
- <div class="button button-selected" id="filter-runtimes" onclick="filterclick(event)">Runtimes</div>
- <div class="button" id="filter-live" onclick="filterclick(event)">Live Image</div>
- <div class="button" id="filter-rf26" onclick="filterclick(event)">F26 Runtime</div>
- </div>
<div class="summary">
<table>
<tr><td>FD/P</td><td> - org.freedesktop.Platform
@@ -79,7 +41,7 @@
<th></th>
</tr>
{% for package in letter.packages %}
- <tr class="package {{ package.klass }} {{ 'hidden' if not package.runtimes }}" {{ 'data-in-runtimes' if package.runtimes else '' }} {{ 'data-in-live' if package.live else '' }} {{ 'data-in-rf26' if package.rf26 else '' }}>
+ <tr class="package {{ package.klass }}">
<td>{{ package.name }}</td>
<td class="{{('absent','dep','present')[package.freedesktop_platform]}}" title="{{ package.freedesktop_platform_why }}"></td>
<td class="{{('absent','dep','present')[package.gnome_platform]}}" title="{{ package.gnome_platform_why }}"></td>
reply other threads:[~2026-09-11 14:40 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178913760919.1.8312106956489200447.flatpaks-flatpak-runtime-fb08efc7f0b4@fedoraproject.org \
--to=otaylor@fishsoup.net \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox