From patchwork Sun Sep 13 13:57:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1363090 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::13e; helo=mail-lf1-x13e.google.com; envelope-from=swupdate+bncbcxploxj6ikrbtok7d5akgqeaqg5xvy@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20161025 header.b=nb/9FSyR; dkim-atps=neutral Received: from mail-lf1-x13e.google.com (mail-lf1-x13e.google.com [IPv6:2a00:1450:4864:20::13e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bq9zn6n3Gz9sT6 for ; Sun, 13 Sep 2020 23:57:39 +1000 (AEST) Received: by mail-lf1-x13e.google.com with SMTP id v128sf2111938lfa.5 for ; Sun, 13 Sep 2020 06:57:39 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1600005454; cv=pass; d=google.com; s=arc-20160816; b=b2NKLclbROQ3hF97Hs3nw6EqnBnLa+Ol6I7Dmir5NMO1/F+AdTgPtVYzR4FSUS2M87 k0ktBPbjlNufoa/EfEldkP1ZjvVnsChbO4Sd+By9eNTOeWmNsUBknCfdMQ9EkQp42ZIZ TGaAW7cS3dPQr1qX58eaaJWbXxfmuB4u4/X8Mi+tPr9bos2iz6LRyGnxMJ06Si0Ex/dj //9eg9f2ti7yPQfEBx9ClsnD7lu34V5gpY/2MXjIRDBolkxC4LUEesjzPIj/+D9773z5 cPv1/KTIcu6HuTlG88iBFmIOlYHGG+SNbgZJvyw8Wj5Pv4hlvctuAJwRMPtj0zqDbFOK 6gqA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=aE7i9LI4VzYo5fMo43Z2CkArPk4CrnJkBMW/2qdyaMo=; b=w6qIok/Bk5nDdbfeo8TqJ5LRd81ux9JpXd8G9+jmE0QKSRtK1XuEcqCd1N6yk3foeo CWEoWAza2qvtx69YsrnOAn+m23ILaVxmuIJ5RlU1lZozOmtnkwEmUOKTjgnfpFNl6iFU WhvO1GRo6o7Rj8KxZqkwT5BINeY6i/Qjhqwd7indH4S2zXxHckiqfXIOl1DqLKd0zxV3 ozYlOGeDHpnVieLnTSTXFP/+FTT4A3PCVlazWP8eW7Qe9AjSP9E9+orEWPK6PCUqfr+n m+38tKdTx+f/yRQtGJ/nOPZp1U8XgUCEDjnVVYtINlnuGG3QdJCnqydto87uuDsXPboz /Q+Q== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=aE7i9LI4VzYo5fMo43Z2CkArPk4CrnJkBMW/2qdyaMo=; b=nb/9FSyRiDOuSg26lko3FMNnk8dmglJ6BS2u+39Yx3dEdYEXkChUsLh3dwANBVBkNz 9wSP3fEfg7Fh581YWzKKYfNEKzH/UtyruIayRadb947krDa7K6jBnmrb+tpwZv1nknwG Gjg1cp755u2rpnGS7pKUGIA5Z76sEm4H4vQOvg7W3WqMOzeSZMmALS2nHAW3eCOSdzt/ ap/tPRsXSCASCyCbmdHYaNHGiDFA3KtylSmCwbTgyrZhSjBraYuutgsLPDA88WX2esui QvFUDaG22xhnZsadnogy3Yh9t6KoAcoPP7akqTDSKMssALvwv9TDSusEredjtbPm8wMA Ilhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=aE7i9LI4VzYo5fMo43Z2CkArPk4CrnJkBMW/2qdyaMo=; b=BmXZJAJkWDadh37abEMQqQ4BcQX2rXKZGWN74Etf3lUb4iuJISjoUDCLGfObkY8BaM nHccxUjN61Nv3EkEUB54y1/B+fVgZ9f/3YVCmedZWzpH7TgeTEg/G5lNWFa+yYA7sVG1 Gmi4tK0h2m5Z1riKzr7Buqhmbw7wWU9mW4akJoGiADRfTHBBcRrtAdPJtER4Whp+GIq0 q0tCOM25pJPG/Ybs247ncxZR0OCwIzlezaWfPQZV5vCrDHAZ8e4B4h63uSWENkGpxR1A YKSBxeg3YUsfsj0JtduPX71dsXCgDp7CsPBnfo3cWdsYROsC4xwkbImoOla+AklrQO8D x+kw== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM530ve59FTvOwcPzOcTkZepvvw9Uro4pKAUGCMe1rmgRtW5gvZ6v/ +mceTztyRRUX7Qep9BJ2Z3k= X-Google-Smtp-Source: ABdhPJx7GEhOF/1G5KDjwMwQxdhAQ8+iVijwdkZO3Fn91IehbyTdP4f3Y55x6Dx8+3IwOXcWD1Azew== X-Received: by 2002:a19:e602:: with SMTP id d2mr3349397lfh.514.1600005453888; Sun, 13 Sep 2020 06:57:33 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:ac2:544e:: with SMTP id d14ls1975526lfn.2.gmail; Sun, 13 Sep 2020 06:57:32 -0700 (PDT) X-Received: by 2002:a05:6512:3702:: with SMTP id z2mr3236751lfr.35.1600005452433; Sun, 13 Sep 2020 06:57:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600005452; cv=none; d=google.com; s=arc-20160816; b=POaaJOmhps2wdXaWEqIG4eKpXx9o3xBd8hQoqwqiUWCOwK07ZkQinX5z1VvcR+TZvE rfo0Y5pT5sLeSW+wjstrk2O+23UqQARw/0NEGFZS6FTU3yNn5pVxHnehb8i8Eqrwmlo8 i5FlsU7J2ePKLb6DlfPnNkTwB+nJJr+GPt62s6d5PNwFAF3VDQhuRIActx+PtLuEFie6 xZGyTgCvVsb4bCzgixl5rCwEcDOh7mFs0xweOcvDTdgynhEgxn3DQhKAjKWHj3Go8hza QCb65s/OM8BinajOxbbIQRlgabinl3Xt83czGU8DZHuFGeUXrCdVVdhqeXUcrTCvb63X KiBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=Gkcif2ETZyLxQjozULFT5bbXwjU8T/r43RgeO0FxAZg=; b=feIhGhe8gxkcUw9dFjT0fbXTZS8R5D86zuuuaOM7G1bGJ8oaKo/MgACGC/lh48n+Da r2aU1RqcZpbAwvUiOy1aKDvPqg009Rx/Xjt2wot2Jou+ROSQDrqmz7d772wBEyIcv692 MQn0indCEgOU3Iu1OgVIOrlgy7kqFhOMUHExe+ZaZ68GNMdZHJrRAqbF1uJlIRl0a4VL UjxYvHLfkQvdMbovA2f4HEZreXotRZZLXxtiJR7hUit1GmsRKWOZROjJldyG7frX1fCD EvDMdaEokSJLRdXPQ6TOYX3wOoYtdwisJ41ing0AF2XwR+sXYViLYf4tZAypU61PITpy Cfvw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de Received: from mail-out.m-online.net (mail-out.m-online.net. [212.18.0.10]) by gmr-mx.google.com with ESMTPS id 138si152608lfb.12.2020.09.13.06.57.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 13 Sep 2020 06:57:32 -0700 (PDT) Received-SPF: neutral (google.com: 212.18.0.10 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) client-ip=212.18.0.10; Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4Bq9zb5drFz1rt4G; Sun, 13 Sep 2020 15:57:31 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4Bq9zb5PSGz1qrgD; Sun, 13 Sep 2020 15:57:31 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id 4IruhdDh8CHt; Sun, 13 Sep 2020 15:57:31 +0200 (CEST) Received: from babic.homelinux.org (host-88-217-136-221.customer.m-online.net [88.217.136.221]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Sun, 13 Sep 2020 15:57:31 +0200 (CEST) Received: from localhost (mail.babic.homelinux.org [127.0.0.1]) by babic.homelinux.org (Postfix) with ESMTP id B07994540606; Sun, 13 Sep 2020 15:57:30 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at babic.homelinux.org Received: from babic.homelinux.org ([IPv6:::1]) by localhost (mail.babic.homelinux.org [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id TVaar5597Y7J; Sun, 13 Sep 2020 15:57:28 +0200 (CEST) Received: from paperino.fritz.box (paperino.fritz.box [192.168.178.64]) by babic.homelinux.org (Postfix) with ESMTP id 52A88454022F; Sun, 13 Sep 2020 15:57:28 +0200 (CEST) From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [PATCH] parser: add result of version check in TRACE Date: Sun, 13 Sep 2020 15:57:23 +0200 Message-Id: <20200913135723.37633-1-sbabic@denx.de> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Original-Sender: sbabic@denx.de X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , After moving version check inside the parser, version will be not checked later and TRACE can print if an artifact is skipped or not. Signed-off-by: Stefano Babic --- parser/parser.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/parser/parser.c b/parser/parser.c index 8f8b25c..c2fe175 100644 --- a/parser/parser.c +++ b/parser/parser.c @@ -662,8 +662,9 @@ static int parse_images(parsertype p, void *cfg, struct swupdate_cfg *swcfg, lua strlen(image->type) ? image->type : "NOT FOUND", image->install_directly ? " (installed from stream)" : "", (strlen(image->id.name) && (image->id.install_if_different || - image->id.install_if_higher)) ? - " Version must be checked" : "" + image->id.install_if_higher) && + (skip || image->skip != SKIP_NONE)) ? + " SKIPPED" : "" ); if (skip || image->skip != SKIP_NONE) { free_image(image);