Message ID | 1502975227-3112-1-git-send-email-sbabic@denx.de |
---|---|
State | Accepted |
Delegated to: | Stefano Babic |
Headers | show
Return-Path: <swupdate+bncBAABBCVK23GAKGQEX3IIQZY@googlegroups.com> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4010:c07::23e; helo=mail-lf0-x23e.google.com; envelope-from=swupdate+bncbaabbcvk23gakgqex3iiqzy@googlegroups.com; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="sJeWI2qr"; dkim-atps=neutral Received: from mail-lf0-x23e.google.com (mail-lf0-x23e.google.com [IPv6:2a00:1450:4010:c07::23e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xY6255Brbz9t4V for <incoming@patchwork.ozlabs.org>; Thu, 17 Aug 2017 23:07:25 +1000 (AEST) Received: by mail-lf0-x23e.google.com with SMTP id 71sf813820lfs.1 for <incoming@patchwork.ozlabs.org>; Thu, 17 Aug 2017 06:07:25 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1502975242; cv=pass; d=google.com; s=arc-20160816; b=eSmQhOcLUKHhZG46tgSZ2d3EW2uAgtUjF/nYQM08BkN+DXGNfdJdOzG0RddYv8MHWa smYFzlFx76b0eJSPMEiDCWkCUA3/obzSfhwpGZQ96JtDrbJyKlI+JXSkFrbFRKfbeu6O AgaBYpAm0Q9zBs19LKtB3IluqVQ2SjDTh2rdQVa6aTdq2IkOdr4rfLYcvM0mMQo74GaV G0kmSxIPYvyOkoFLBuQbbqOMJKGSx7mfQ2kC0YG6OVSlQJsooqunA4QJk7T6HxnQc6Fb 9Zeg9rPkLT4n0+lrgAL5BGYosS8V2kbH+dlFiNcgfFJEMgcVnPxccAO1XGRnXWdnD9xE lFCQ== 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:message-id:date:subject:cc:to:from :arc-authentication-results:arc-message-signature:mime-version :sender:dkim-signature:arc-authentication-results; bh=Wl+5kk6tBoUQEspr23zeWJ6KJ6/TF4x4eHFcYW6jPQc=; b=LpnjaS4SwjQ8Y56C2V8Bzil6OIqv/KjzpAiKcM+shG5tdMufnPM/UrfDMs6zauBErY ZxV4u4GJhHhoxDSEEJjXwTzVGPZi/fXsAvdCth66aBlBxku74NzNtw/hqSEHCLdvahRR ibj/ojGU00NMzijHRwP30WSHOXCaaNGrVp85K+YRpKdgiZySGrgeAYPn4tSuDDuV/gCS h1OLCRTTgUc6/W/b1X7HKbLY0aL0TH0ZYVH2/j9pm2g1xGGhdeAXsw50A5k+hrX0R7rt MhF0ymAmB1AvToM3GIDDuFZo1KzaLe55rq3aKLAi/WLdAHZ/WLlyGcwq+SEBCIik/K9N O6Hg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=neutral (google.com: 2001:a60:0:28:0:1:25:1 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:mime-version:from:to:cc:subject:date:message-id :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=Wl+5kk6tBoUQEspr23zeWJ6KJ6/TF4x4eHFcYW6jPQc=; b=sJeWI2qrYcbNZEVWDuGAFPFQLTQIHX7KVelQveeelfBcol+ZccV8+r1ThMiJPdQTTY sJDgOP7qapTjXfNlwwNh/TmsemJeNyzlTnwn7j86onju3ZIIydvWF0NOpBHNMA2fO/Qb ZZt3uqOKxgCk75fBr54Ui8OZn/jUOPN8ehJCdhOpOS4iS0Cq4X6y7wR7hKcskbSjY1Pa er5ZuCU9Yr1i0bzjnkzc1oMXgsO6gU7DSJ4I4IEBiMK8BmquKYpSxpkHtcH1u3YAZmNo 4jCKC3ahaSE47lPjot5dzWpSU5CdsTLgPLrZX/2KVlVa+P7gRyOSecV8/cMb5bRuK7f4 J/PA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id: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=Wl+5kk6tBoUQEspr23zeWJ6KJ6/TF4x4eHFcYW6jPQc=; b=TWBGOSNqya3UhTC/gOKkKIvOoAkK/zvKLhGBkxiPCfQPDz+/A2Krf+uFGBA6Ik4yeo ieTSEyTI+pb/reZxGVz2wPQcVxRp9STenDriZoN7C1Q1w9pyM/DAY6cfEfweJJ41P5je X0J4wZrDsbmQOnLx+tNcNw5iWHBQmlACr6050nkN+ahXSn/svQu1S7dlHxFhArz3xuI0 KVO0le4ZrLeC5IWI9DOc4pqZzxWMeOZtoIrm3KeE0vnxOJB0BwWTzwso35RVIZnJUEV/ ZOPQaD1x1MGuZdUoCtKIBbGQ5uo6mIqfhoStimSj+srCaApCYT8/VlVOxHzpvyE3mng0 AAYw== Sender: swupdate@googlegroups.com X-Gm-Message-State: AHYfb5h3NLqidnKcl9/FL0pqUL+xJG0/+biAksO1ZprzlFpaBbD3MdUv pnNLATvL0GAY5g== X-Received: by 10.28.66.205 with SMTP id k74mr2280wmi.10.1502975242557; Thu, 17 Aug 2017 06:07:22 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 10.28.55.130 with SMTP id e124ls758842wma.24.gmail; Thu, 17 Aug 2017 06:07:22 -0700 (PDT) X-Received: by 10.28.51.131 with SMTP id z125mr283295wmz.16.1502975242169; Thu, 17 Aug 2017 06:07:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502975242; cv=none; d=google.com; s=arc-20160816; b=p9yay5iub9OJfqPZ+C0zXZV7KNYa8Q5wGU7zpsI+hh1ZnQTXyJZOTeVgnHxtN5xuaj PX3+j95LqXEsdyE3VVXrFBpI8AxyPwUKYF+JvOE0/AMHTYwaLqXBO3cIQVaIejAQsKcy LYj3F0qkWXv92U62KIO0kC88AVYs1x9Ek1nMyGvhdfuIXZN/xMf6WAnfbncKy5WmyL82 hwYdflHSKeikKV+h/wtDgGzwRS926aplLhYuw1VQX2DCsBA3xGvaEab1P4cbKTKcyo1T hMWG61xjwaBLnhchp4YFIc5BnS2W4FDUXlbmLrYM/xzqeyDesKSlg9FZt/4u3l2ufkMS yC2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=AqeRdpbYeFt/RU0JA5Yvp0quWAFvTT1POzae8BkXHIo=; b=rIwRhbR/iMXnviS62yXUjwvPw7IXi1GDC+4xITT7rrX8pUPvVYg785p1c6maeopYOo qFOIX0V11uTzMrR7mAMVSHtHIsE92vI8oiWdlbJBckKIo7PhKc7IVGmPyGWVakjt67/p M7fpqpkm8sxmcecs53qjKM1R/oaamnM3xezwP4l1iP7/tBw4WPHEfQq5URo/5R/R7DUc nV/hYKsctVa/TiITZjNHIVBfWlCdnFgEL3lH87GrIoXMszSuCMeScOj1oQfJNQMjgDbo E7x6FZZlVff5Mz85OJzrLVxSaNtcKj/m0Q5Sbn2bXG5wdYonZKX/kWJrfyHesJgR1kkS YPTQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 2001:a60:0:28:0:1:25:1 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. [2001:a60:0:28:0:1:25:1]) by gmr-mx.google.com with ESMTPS id o62si1554421wmo.2.2017.08.17.06.07.22 for <swupdate@googlegroups.com> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Aug 2017 06:07:22 -0700 (PDT) Received-SPF: neutral (google.com: 2001:a60:0:28:0:1:25:1 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) client-ip=2001:a60:0:28:0:1:25:1; Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3xY6216kmQz1qryn; Thu, 17 Aug 2017 15:07:21 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 3xY6212wcWz3jR9q; Thu, 17 Aug 2017 15:07:21 +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 PeCn4I1sETqs; Thu, 17 Aug 2017 15:07:15 +0200 (CEST) Received: from babic.homelinux.org (host-88-217-136-221.customer.m-online.net [88.217.136.221]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Thu, 17 Aug 2017 15:07:15 +0200 (CEST) Received: from localhost (mail.babic.homelinux.org [127.0.0.1]) by babic.homelinux.org (Postfix) with ESMTP id 41E6A45405ED; Thu, 17 Aug 2017 15:07:15 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at babic.homelinux.org Received: from babic.homelinux.org ([127.0.0.1]) by localhost (mail.babic.homelinux.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id t4eVjOB43ViZ; Thu, 17 Aug 2017 15:07:09 +0200 (CEST) Received: from papero.fritz.box (papero.fritz.box [192.168.178.132]) by babic.homelinux.org (Postfix) with ESMTP id 4294845403C3; Thu, 17 Aug 2017 15:07:09 +0200 (CEST) From: Stefano Babic <sbabic@denx.de> To: swupdate@googlegroups.com Cc: Stefano Babic <sbabic@denx.de> Subject: [swupdate] [PATCH] hawkbit: artifact not installed if SWU is not the first Date: Thu, 17 Aug 2017 15:07:07 +0200 Message-Id: <1502975227-3112-1-git-send-email-sbabic@denx.de> X-Mailer: git-send-email 2.7.4 X-Original-Sender: sbabic@denx.de X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 2001:a60:0:28:0:1:25:1 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: <swupdate.googlegroups.com> X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: <https://groups.google.com/group/swupdate/post>, <mailto:swupdate@googlegroups.com> List-Help: <https://groups.google.com/support/>, <mailto:swupdate+help@googlegroups.com> List-Archive: <https://groups.google.com/group/swupdate List-Subscribe: <https://groups.google.com/group/swupdate/subscribe>, <mailto:swupdate+subscribe@googlegroups.com> List-Unsubscribe: <mailto:googlegroups-manage+605343134186+unsubscribe@googlegroups.com>, <https://groups.google.com/group/swupdate/subscribe> |
diff --git a/suricatta/server_hawkbit.c b/suricatta/server_hawkbit.c index 605733f..4603803 100644 --- a/suricatta/server_hawkbit.c +++ b/suricatta/server_hawkbit.c @@ -1076,7 +1076,7 @@ server_op_res_t server_process_update_artifact(int action_id, if (endfilename <= 0 || strncmp(&s[endfilename], ".swu", 4)) { DEBUG("File '%s' is not a SWU image, skipping", s); - goto cleanup; + continue; } DEBUG("Processing '%s' from '%s'\n",
If the Hawkbit server delivers artifacts not in SWU format, SWUpdate stops. The behaviour is changed and SWUpdate will simply skip all artifacts that are not SWU images. This avoids that Software is not installed at all if SWU is not the first artifact in the list provided by the server. Signed-off-by: Stefano Babic <sbabic@denx.de> --- suricatta/server_hawkbit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)