From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6635926855683670016 X-Received: by 2002:a1c:c282:: with SMTP id s124mr209615wmf.24.1545121242588; Tue, 18 Dec 2018 00:20:42 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:da4d:: with SMTP id r74ls154604wmg.2.gmail; Tue, 18 Dec 2018 00:20:42 -0800 (PST) X-Google-Smtp-Source: AFSGD/WWGLv9aFESETj8fxe0sqA7kAkQi2m64HHyl04nl4QZUKPFQTrwcj7Wlltm14h6UJ5us9AD X-Received: by 2002:a7b:c414:: with SMTP id k20mr198427wmi.8.1545121242155; Tue, 18 Dec 2018 00:20:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545121242; cv=none; d=google.com; s=arc-20160816; b=T33AvbsgC6POnBad3uCogH8nANpa0JVKBEI12RtU1tXX5XoQeXIaRSOdFZn5spFknA kv0b36nImh7eJHSHbeZTgJfV3Ha80pv7rcPSnygemtWiMNfDQ55+CewzMoFj4KvstuNl Jn7ewIuDA7U7bFxbu5RYHnVaqJkpmRbPCE1i73gKsFKhslcMHMtLLWhv+0wukcqWRAXR VR71qCXUhpoOWvSDi5XEqY8NHjOmUFSMq+shz0O806dxHR0cSvSoBsyERAr+Vuv2wno1 TF/ni7UkQWO9/aWxvzbZVEr+DBCmTPXqdDiFGsLze2l/kuLhhVyHLO7kfAsuGN4vA39H jfkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject; bh=eNwgLpUq17mo9P1bfdx5vOEFZxDzkOwSdmRDJk/nzZc=; b=RnvRm/hqzXqOgE4KtNPjnuUxJkXWcBlTzzorSLbmy1bRdBYwpH6+1FrLNIxJxrlxRz UXYS2qLXj+NpMkHvhvl/19fNwo/C4YLEbu0lCJLf241r5yTc+n5nbQu2JnLKJ/zyjlgO z64kOxeBOXWZYYO4TuQvTvCSlILd6lAN768/EfDi1qqSnASKYnyksbVIHGTagZhufpFE Agb/Go7ylfjfVlalNOGbxXAaL4mVsFyyP6wuKLPowoOH6VAlkL33YFeF3itnnGi9tSn4 VWTdhCgryWOAgUAa2kX22xH9Y325eTnq6Kr85vswp3wcHVYYoT9aeDCvsvYyjiZOpG55 FFBQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id h22si97198wmb.2.2018.12.18.00.20.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Dec 2018 00:20:42 -0800 (PST) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id wBI8KenY027630 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 18 Dec 2018 09:20:40 +0100 Received: from [139.25.69.181] (linux-ses-ext02.ppmd.siemens.net [139.25.69.181]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id wBI8KeaZ012264; Tue, 18 Dec 2018 09:20:40 +0100 Subject: Re: [PATCH v2 2/2] isar-bootstrap: simplified distro source functions To: =?UTF-8?B?VG9sZ2EgSG/Fn2fDtnI=?= Cc: isar-users@googlegroups.com References: <20181217114518.17995-1-tolga.hosgor@siemens.com> <20181217114518.17995-3-tolga.hosgor@siemens.com> <91c39b5a-f581-b309-7626-f24149da0473@siemens.com> From: Claudius Heine Message-ID: <27c2d5ed-42b3-c3d3-73df-e33bf4e99368@siemens.com> Date: Tue, 18 Dec 2018 09:20:40 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.3.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-TUID: RyymIssP8VMJ Hi Tolga, On 17/12/2018 19.11, Tolga Hoşgör wrote: > Hi, > > The second patch is kind of an unrelated clean up that does a relatively > big change to other parts of the code (get_distro_primary_source_entry to > be exact). I believe it is better off as a separate commit that is > revertible on its own. But I pointed out the changes to get_distro_have_https_source specifically. If you feel that refactoring of your just introduced `get_distro_primary_source_entry` function should be handled separately, then OK. I sort of see where you are coming from here. Since you just split a function before and then change it in the next patch. Also please avoid top-posting in mailing lists. Cheers, Claudius > > On Mon, Dec 17, 2018, 14:55 Claudius Heine wrote: > >> Hi Tolga, >> >> On 17/12/2018 12.45, Hosgor, Tolga (CT RDA DS EU TR MTS) wrote: >>> - distro sources are created with a generator >>> - debian-buster.list begins with a 'deb-src' to test >>> the parser works correctly >>> >>> Signed-off-by: Hosgor, Tolga (CT RDA DS EU TR MTS) < >> tolga.hosgor@siemens.com> >>> --- >>> meta-isar/conf/distro/debian-buster.list | 1 + >>> .../isar-bootstrap/isar-bootstrap.inc | 22 ++++++++----------- >>> 2 files changed, 10 insertions(+), 13 deletions(-) >>> >>> diff --git a/meta-isar/conf/distro/debian-buster.list >> b/meta-isar/conf/distro/debian-buster.list >>> index 92d20e1..7828671 100644 >>> --- a/meta-isar/conf/distro/debian-buster.list >>> +++ b/meta-isar/conf/distro/debian-buster.list >>> @@ -1,3 +1,4 @@ >>> +deb-src http://ftp.de.debian.org/debian buster main contrib >> non-free >>> deb http://ftp.de.debian.org/debian buster main contrib non-free >>> deb https://debian.inf.tu-dresden.de/debian buster main contrib >> non-free >>> deb http://ftp.de.debian.org/debian buster-updates main contrib >> non-free >>> diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc >> b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc >>> index d868bb6..6dc1888 100644 >>> --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc >>> +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc >>> @@ -117,7 +117,7 @@ def get_aptsources_list(d, is_host=False): >>> apt_sources_list = (d.getVar("DISTRO_APT_SOURCES", True) or >> "").split() >>> return apt_sources_list >>> >>> -def get_distro_primary_source_entry(d, is_host=False): >>> +def generate_distro_sources(d, is_host=False): >>> apt_sources_list = get_aptsources_list(d, is_host) >>> for entry in apt_sources_list: >>> entry_real = bb.parse.resolve_file(entry, d) >>> @@ -126,21 +126,17 @@ def get_distro_primary_source_entry(d, >> is_host=False): >>> parsed = parse_aptsources_list_line(line) >>> if parsed: >>> parsed = get_apt_source_mirror(d, parsed) >>> - if parsed[0] == "deb": >>> - return parsed[2:] >>> + yield parsed >>> + >>> +def get_distro_primary_source_entry(d, is_host=False): >>> + apt_sources_list = get_aptsources_list(d, is_host) >>> + for source in generate_distro_sources(d, is_host): >>> + if source[0] == "deb": >>> + return source[2:] >>> return ["", "", ""] >>> >>> def get_distro_have_https_source(d, is_host=False): >>> - for entry in get_aptsources_list(d, is_host): >>> - entry_real = bb.parse.resolve_file(entry, d) >>> - with open(entry_real, "r") as in_fd: >>> - for line in in_fd: >>> - parsed = parse_aptsources_list_line(line) >>> - if parsed: >>> - parsed = get_apt_source_mirror(d, parsed) >>> - if parsed[2].startswith("https://"): >>> - return True >>> - return False >>> + return any(source[2].startswith("https://") for source in >> generate_distro_sources(d, is_host)) >> >> Maybe you should merge those changes into the first patch? >> >> Changing the same code in one patchset makes the review more difficult, >> also I don't really see a reason for this split here. >> >> Cheers, >> Claudius >> >>> >>> def get_distro_needs_https_support(d, is_host=False): >>> if get_distro_have_https_source(d, is_host): >>> >> >> -- >> DENX Software Engineering GmbH, Managing Director: Wolfgang Denk >> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany >> Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de >> > -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de