diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2021-05-11 18:08:09 +0300 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2021-05-24 23:35:00 +0300 |
| commit | a5cf1fbb3bc0b4bf5ce602f03eb2c0c4b8a94774 (patch) | |
| tree | 36d0003faebd7d6bbbcbce625a5d9b6ac6c4579a /calm/pkg2html.py | |
| parent | aece4eb9b30d107c1f30aed6e86f170c943c16a0 (diff) | |
Ignore 'skip' hint
Ignore the 'skip' hint, as it's meaningless, now we properly classify
packages as source or install.
Instead, if installing a non-obsolete package will do nothing, mark it
as not_for_output.
Future work: also allow the 'does nothing' check to apply to '_obsolete'
packages. At the moment this would catch a few more packages which
probably need to be obsoleted: by something before they can be safely
removed.
(It's not safe to simply vault them as we need to ensure any existing
installed files owned by that package are removed when a system with
them installed is updated.)
Diffstat (limited to 'calm/pkg2html.py')
| -rwxr-xr-x | calm/pkg2html.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/calm/pkg2html.py b/calm/pkg2html.py index 7a32e7f..5113d36 100755 --- a/calm/pkg2html.py +++ b/calm/pkg2html.py @@ -329,9 +329,8 @@ def write_packages_inc(args, packages, name, kind, includer): if p.endswith('-debuginfo'): continue - if packages[arch][p].kind == package.Kind.binary: - if packages[arch][p].skip: - continue + if packages[arch][p].not_for_output: + continue if packages[arch][p].kind == kind: package_list[packages[arch][p].orig_name] = p |