[elbe-devel] [PATCH 2/8] virtapt: remove unused name parameter
Torben Hohn
torben.hohn at linutronix.de
Mon Jan 8 15:08:34 CET 2018
On Fri, Jan 05, 2018 at 10:35:29PM +0100, Manuel Traut wrote:
> remove unused parameter and fixup all users
>
> Signed-off-by: Manuel Traut <manut at linutronix.de>
Reviewed-by: Torben Hohn <torben.hohn 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
>
>
> _______________________________________________
> elbe-devel mailing list
> elbe-devel at linutronix.de
> https://lists.linutronix.de/mailman/listinfo/elbe-devel
--
Mit freundlichen Grüßen
Torben Hohn
Linutronix GmbH
Standort: Bremen
Phone: +49 7556 25 999 18; Fax.: +49 7556 25 999 99
Firmensitz / Registered Office: D-88690 Uhldingen, Bahnhofstr. 3
Registergericht / Local District Court: Amtsgericht Freiburg i. Br.; HRB
Nr. / Trade register no.: 700 806
Geschäftsführer / Managing Directors: Heinz Egger, Thomas Gleixner
Eine Bitte von uns: Sollten Sie diese E-Mail irrtümlich erhalten haben,
benachrichtigen Sie uns in diesem Falle bitte sobald wie es Ihnen
möglich ist, durch Antwort-Mail. Vielen Dank!
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: Digital signature
URL: <http://lists.linutronix.de/pipermail/elbe-devel/attachments/20180108/dffcaecb/attachment.sig>
More information about the elbe-devel
mailing list