[elbe-devel] [PATCH] elbepack: rpcaptcache: drop notifier support
Thomas Weißschuh
thomas.weissschuh at linutronix.de
Wed Aug 28 08:23:26 CEST 2024
It was never used.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh at linutronix.de>
---
elbepack/elbeproject.py | 6 +-----
elbepack/rpcaptcache.py | 9 +++------
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/elbepack/elbeproject.py b/elbepack/elbeproject.py
index 7058b3e9263d..2eb4ac6a72e8 100644
--- a/elbepack/elbeproject.py
+++ b/elbepack/elbeproject.py
@@ -117,7 +117,6 @@ class ElbeProject:
override_buildtype=None,
skip_validate=False,
url_validation=ValidationMode.CHECK_ALL,
- rpcaptcache_notifier=None,
postbuild_file=None,
presh_file=None,
postsh_file=None,
@@ -139,10 +138,8 @@ class ElbeProject:
self.postsh_file = postsh_file
self.savesh_file = savesh_file
- # Apt-Cache will be created on demand with the specified notifier by
- # the get_rpcaptcache method
+ # Apt-Cache will be created on demand by the get_rpcaptcache method
self._rpcaptcache = None
- self.rpcaptcache_notifier = rpcaptcache_notifier
# Initialise Repo Images to Empty list.
self.repo_images = []
@@ -886,7 +883,6 @@ class ElbeProject:
if env.rpcaptcache is None:
env.rpcaptcache = get_rpcaptcache(env.rfs, arch,
- self.rpcaptcache_notifier,
norecommend,
self.xml.prj.has('noauth'))
return env.rpcaptcache
diff --git a/elbepack/rpcaptcache.py b/elbepack/rpcaptcache.py
index d292b4130167..b89b4b6deee6 100644
--- a/elbepack/rpcaptcache.py
+++ b/elbepack/rpcaptcache.py
@@ -65,12 +65,10 @@ class InChRootObject:
@MyMan.register('RPCAPTCache')
class RPCAPTCache(InChRootObject):
- def __init__(self, rfs, arch,
- notifier=None, norecommend=False, noauth=True):
+ def __init__(self, rfs, arch, norecommend=False, noauth=True):
super().__init__(rfs)
- self.notifier = notifier
config.set('APT::Architecture', arch)
if norecommend:
config.set('APT::Install-Recommends', '0')
@@ -278,8 +276,7 @@ class RPCAPTCache(InChRootObject):
return self.rfs.fname(fetch_source(src_name, src_version, dest_dir, ElbeAcquireProgress()))
-def get_rpcaptcache(rfs, arch,
- notifier=None, norecommend=False, noauth=True):
+def get_rpcaptcache(rfs, arch, norecommend=False, noauth=True):
mm = MyMan()
mm.start()
@@ -288,4 +285,4 @@ def get_rpcaptcache(rfs, arch,
# see the creation of MyMan.RPCAPTCache by
# MyMan.register()
#
- return mm.RPCAPTCache(rfs, arch, notifier, norecommend, noauth)
+ return mm.RPCAPTCache(rfs, arch, norecommend, noauth)
---
base-commit: 875ed868613018af7d7544349996e93deccfcb0f
change-id: 20240828-rpcaptcache-notifier-4507c057bab4
Best regards,
--
Thomas Weißschuh <thomas.weissschuh at linutronix.de>
More information about the elbe-devel
mailing list