From fe2df01e8b73a2bb6c66aeabb8fda4f0406615c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Thu, 1 Aug 2019 10:03:58 +0200 Subject: [PATCH] Remove pickling from source repos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The pickled pkgset was only ever used for debug mode. We don't use that anymore. Let's stop writing files that are not used anywhere. Signed-off-by: Lubomír Sedlář --- pungi/phases/pkgset/sources/source_koji.py | 1 - pungi/phases/pkgset/sources/source_repos.py | 7 ------- 2 files changed, 8 deletions(-) diff --git a/pungi/phases/pkgset/sources/source_koji.py b/pungi/phases/pkgset/sources/source_koji.py index 237b6048..cb7ab137 100644 --- a/pungi/phases/pkgset/sources/source_koji.py +++ b/pungi/phases/pkgset/sources/source_koji.py @@ -641,7 +641,6 @@ def populate_global_pkgset(compose, koji_wrapper, path_prefix, event): # tag - we do not have to merge in this case... variant.pkgsets.add(compose_tag) # TODO pickle pkgset to disk - # TODO save pkgset file list # TODO save pkgset file cache pkgsets.append( MaterializedPackageSet.create( diff --git a/pungi/phases/pkgset/sources/source_repos.py b/pungi/phases/pkgset/sources/source_repos.py index f00f79d0..bca34f38 100644 --- a/pungi/phases/pkgset/sources/source_repos.py +++ b/pungi/phases/pkgset/sources/source_repos.py @@ -15,7 +15,6 @@ import os -from six.moves import cPickle as pickle from kobo.shortcuts import run @@ -120,18 +119,12 @@ def get_pkgset_from_repos(compose): def populate_global_pkgset(compose, file_list, path_prefix): ALL_ARCHES = get_all_arches(compose) - global_pkgset_path = os.path.join(compose.paths.work.topdir(arch="global"), "packages.pickle") - compose.log_info("Populating the global package set from a file list") pkgset = pungi.phases.pkgset.pkgsets.FilelistPackageSet( "repos", compose.conf["sigkeys"], logger=compose._logger, arches=ALL_ARCHES ) pkgset.populate(file_list) - with open(global_pkgset_path, "wb") as f: - pickle.dump(pkgset, f, protocol=pickle.HIGHEST_PROTOCOL) - # write global package list - pkgset.save_file_list(compose.paths.work.package_list(arch="global"), remove_path_prefix=path_prefix) return pkgset