[elbe-devel] [PATCH 2/8] virtapt: remove unused name parameter
Manuel Traut
manut at linutronix.de
Fri Jan 5 22:35:29 CET 2018
remove unused parameter and fixup all users
Signed-off-by: Manuel Traut <manut at linutronix.de>
---
elbepack/commands/check_updates.py | 4 +---
elbepack/pkgutils.py | 3 +--
elbepack/virtapt.py | 2 +-
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/elbepack/commands/check_updates.py b/elbepack/commands/check_updates.py
index fb8e2242..410f8fec 100644
--- a/elbepack/commands/check_updates.py
+++ b/elbepack/commands/check_updates.py
@@ -70,14 +70,12 @@ def run_command(argv):
arch = xml.text("project/buildimage/arch", default=defs, key="arch")
suite = xml.text("project/suite")
- name = xml.text("project/name", default=defs, key="name")
-
apt_sources = xml.text("sources_list").replace("10.0.2.2", "localhost")
apt_prefs = xml.text("apt_prefs")
fullp = xml.node("fullpkgs")
- v = virtapt.VirtApt(name, arch, suite, apt_sources, apt_prefs)
+ v = virtapt.VirtApt(arch, suite, apt_sources, apt_prefs)
d = virtapt.apt_pkg.DepCache(v.cache)
d.read_pinfile(v.projectpath + "/etc/apt/preferences")
diff --git a/elbepack/pkgutils.py b/elbepack/pkgutils.py
index 09fd5f2d..47d11cf9 100644
--- a/elbepack/pkgutils.py
+++ b/elbepack/pkgutils.py
@@ -138,14 +138,13 @@ def get_initrd_uri(prj, defs, arch):
arch = prj.text("buildimage/arch", default=defs, key="arch")
suite = prj.text("suite")
- name = prj.text("name", default=defs, key="name")
apt_sources = get_sources_list(prj, defs)
apt_keys = get_key_list(prj)
target_pkg = get_initrd_pkg(prj, defs)
if virtapt_imported:
try:
- v = virtapt.VirtApt(name, arch, suite, apt_sources, "", apt_keys)
+ v = virtapt.VirtApt(arch, suite, apt_sources, "", apt_keys)
except Exception as e:
return get_initrd_uri_nonvirtapt(apt_sources, target_pkg, arch)
diff --git a/elbepack/virtapt.py b/elbepack/virtapt.py
index 34c31b36..3443e477 100644
--- a/elbepack/virtapt.py
+++ b/elbepack/virtapt.py
@@ -32,7 +32,7 @@ from elbepack.directories import elbe_pubkey_fname
class VirtApt:
- def __init__(self, name, arch, suite, sources, prefs, keylist=[]):
+ def __init__(self, arch, suite, sources, prefs, keylist=[]):
self.projectpath = mkdtemp()
self.initialize_dirs()
--
2.15.1
More information about the elbe-devel
mailing list