vladan/workstation-ostree-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

comps-sync.py: remove unused varaibles and minor renaming

Browse source
This commit is contained in:
Timothée Ravier 2019-04-07 12:30:37 +02:00
parent af221374f2
commit 49f86462ec
1 changed files with 18 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
comps-sync.py
View file

@ -41,6 +41,7 @@ print("Syncing packages common to all desktops:")
base_pkgs_path = 'fedora-common-ostree-pkgs.yaml'
with open(base_pkgs_path) as f:
manifest = yaml.safe_load(f)
manifest_packages = set(manifest['packages'])
with open('comps-sync-blacklist.yml') as f:
doc = yaml.safe_load(f)
@ -49,12 +50,6 @@ with open('comps-sync-blacklist.yml') as f:
comps_blacklist_groups = doc['blacklist_groups']
comps_desktop_blacklist = doc['desktop_blacklist']
manifest_packages = set(manifest['packages'])
comps_unknown = set()
comps_packages = set()
workstation_product_packages = set()
# Parse comps, and build up a set of all packages so we
# can find packages not listed in comps *at all*, beyond
# just the workstation environment.
@ -91,6 +86,7 @@ ws_ostree_pkgs = set()
for pkg in comps.groups_match(id=ws_ostree_name)[0].packages:
ws_ostree_pkgs.add(pkg.name)
comps_unknown = set()
for pkg in manifest_packages:
if (pkg not in comps_whitelist and
pkg not in ws_pkgs and
@ -134,51 +130,47 @@ for desktop in [ 'gnome-desktop', 'kde-desktop', 'xfce-desktop', 'lxqt-desktop'
manifest_path = '{}-pkgs.yaml'.format(desktop)
with open(manifest_path) as f:
manifest = yaml.safe_load(f)
manifest_packages = set(manifest['packages'])
ws_ostree_name = desktop
comps_unknown = set()
comps_packages = set()
workstation_product_packages = set()
# Parse the desktop group
ws_pkgs = set()
# Filter packages in the comps desktop group using the blacklist
comps_group_pkgs = set()
for pkg in comps.groups_match(id=desktop)[0].packages:
pkgname = pkg.name
blacklist = comps_desktop_blacklist.get(ws_ostree_name, set())
blacklist = comps_desktop_blacklist.get(desktop, set())
if pkgname in blacklist:
continue
ws_pkgs.add(pkg.name)
comps_group_pkgs.add(pkg.name)
# Look for packages in the manifest but not in comps group
comps_unknown = set()
for pkg in manifest_packages:
if pkg not in ws_pkgs:
if pkg not in comps_group_pkgs:
comps_unknown.add(pkg)
# Look for packages in the manifest but not in comps at all
n_manifest_new = len(comps_unknown)
if n_manifest_new == 0:
print(" - All manifest packages are already listed in comps.")
else:
print(" - {} packages not in {} comps group:".format(n_manifest_new, ws_ostree_name))
print(" - {} packages not in {} comps group:".format(n_manifest_new, desktop))
for pkg in sorted(comps_unknown):
print(' {}'.format(pkg))
manifest_packages.remove(pkg)
# Look for packages in comps but not in the manifest
ws_added = set()
for pkg in ws_pkgs:
desktop_pkgs_added = set()
for pkg in comps_group_pkgs:
if pkg not in manifest_packages:
ws_added.add(pkg)
manifest_packages.add(pkg)
desktop_pkgs_added.add(pkg)
n_comps_new = len(ws_added)
n_comps_new = len(desktop_pkgs_added)
if n_comps_new == 0:
print(" - All comps packages are already listed in manifest.")
else:
print(" - {} packages not in {} manifest:".format(n_comps_new, ws_ostree_name))
for pkg in sorted(ws_added):
print(" - {} packages not in {} manifest:".format(n_comps_new, desktop))
for pkg in sorted(desktop_pkgs_added):
print(' {}'.format(pkg))
manifest_packages.add(pkg)
# Update manifest
if (n_manifest_new > 0 or n_comps_new > 0) and args.save:
write_manifest(manifest_path, manifest_packages, include="fedora-common-ostree.yaml")