From patchwork Fri Nov 20 19:04:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Storm, Christian" X-Patchwork-Id: 1404044 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::440; helo=mail-wr1-x440.google.com; envelope-from=swupdate+bncbdd6bwv65qpbbvnf4d6qkgqej3drkzy@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=siemens.com 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=Pt2lo5ZK; dkim-atps=neutral Received: from mail-wr1-x440.google.com (mail-wr1-x440.google.com [IPv6:2a00:1450:4864:20::440]) (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 4Cd5XY1XTqz9sVH for ; Sat, 21 Nov 2020 06:02:51 +1100 (AEDT) Received: by mail-wr1-x440.google.com with SMTP id z7sf3770449wrl.14 for ; Fri, 20 Nov 2020 11:02:51 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1605898966; cv=pass; d=google.com; s=arc-20160816; b=vA/FTPP1qYgUIVfmjCj28af9IdxnX8T2IJiF1W+IT7GLeh5UP3r9+kO3tQv7hB+s1m dYrax1qoa+BG7EHhTselIxB5wnHoLSRbt1PFeetGypCkfXSecBOJjWw6epgz1cDUjZsS qysFjW/ZzXnG3bpR8SvNlY+gWSScLiuY50ghxsYDXiW/jVl0+7OaaiNZLwXCRFcY0oNY LZyhUWNZngOd0PYuXd6ydUZuJXeaUXjQj+XeCkLwiRrqJJPDJQKv6RHuRcpC//udc6ox Af6uI3Vup8NTiem31Q7tbVRtAo6xe6O64daEK+O+cmwxRmGP72dDLnLKnRqaBEYBBaUw DBLQ== 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=GVTwWtWCG8WKTOqlPzmVaqBX8HEgAY2zmGWxwf7+9UE=; b=1B7e8ro88WHbTEuejRQQ5lnq+UQW/b5ID6fZ5WMfD85kNi3RVEhLBpeoPsv7bt7qWm mOOImtal0+8PpvAQFJqA7ROqt3ZRc0J4FpMUUJFIkXA6BOxhx7khsMachCeELhEuQUk+ eLr4Ax6og83MiEIFS3mMjUFzXsLJqMOGyBSl28CA7++jG7586MHt8Tigx+77huxyf79S 8J2FSY1m3Uu3dlTAfBcLLnZKdF5TazXBQ7jbdF9V97BMxHRxv1cC0hyHmPtkIFd4CcKu SToj5bv8I1iPb+8D95aD+w9gEDBrgGHeoSOFz2fxz0bUYaLrc6wMUmNCNbGovjLwc0pz 9Uzg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=christian.storm@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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=GVTwWtWCG8WKTOqlPzmVaqBX8HEgAY2zmGWxwf7+9UE=; b=Pt2lo5ZKuSaN1bZoRKWYCQOx83XldU1B5DoyBGMMJzZ10gYPPrZPYwrghrCK+uAUsA fE5NLDdx3rKc1Hey+ExCM+IMJ3JrYq4++sf0SLI6MvnWeUCrjDzDVNyIdLrXGVhrUJgw w609iOsDK8YTwRlvQVVeETo/wdPo4lGft5xMFWoinGemIA4AcHP7XoawawzG1IB43XOk 92Ey6wO8M8XjXc66gST8lfGAunpXDXKmS7GdqvDVG06EqVIl9OaVPUtVPkyvRnF2f8qq Ubxms2WNI0PMdBzLRtrl5xcG5WPMrVa2RSERiHFtvdtVx8KWt3D/EYXBqzGQ3pyz+cSw mqtg== 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=GVTwWtWCG8WKTOqlPzmVaqBX8HEgAY2zmGWxwf7+9UE=; b=JS3nLKaVWe/qU7rJEhO9HuOOu7FTVTtYLcy3V6oejMQeCvuRp5awalEesj4/Zzrw9x bTzdLWGeS53XZdFCicwjzCffd3TkAU4488K9Gtz8x2oiiWZ9vZEukGu5SG3VgF5pyBSN us1V/8t3utroqgRbTuIOXv4oJwbPjGaItZfhJvgrGGnkfyAvVcWVQKTD++xp/5OZUdcE 1TQnXe5HWPjW3xSxYCbxWRCfGLCNc+idXtBVEYtGc+qksizImxBMtuRzWwuwNAB+XFxM QvgXssuGY24VEOd/YPrsQs8QbDkfBRzRwGPruRzTVYU832bd8mJ+sCm+Op+m1RBHSmxN 9bFg== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM532t9lWYsuk7ay57/EVeSWptETBbT0q0JoHUiY1oVhwdcWizcjb5 V4ZbJIfJoYTkdPd/RXXL9qY= X-Google-Smtp-Source: ABdhPJzx9+wHxOGyaW3krRFmVaWQrrwl0p7n30VmQnxF0cBcdCnmH8cTXjb0BUtFojjiPR2fuDqBmw== X-Received: by 2002:a5d:4d4d:: with SMTP id a13mr18805671wru.152.1605898965929; Fri, 20 Nov 2020 11:02:45 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:600c:414c:: with SMTP id h12ls1485785wmm.2.gmail; Fri, 20 Nov 2020 11:02:44 -0800 (PST) X-Received: by 2002:a05:600c:414b:: with SMTP id h11mr11382143wmm.89.1605898964915; Fri, 20 Nov 2020 11:02:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605898964; cv=none; d=google.com; s=arc-20160816; b=Dts6XA1y1xGE604i2hE+BLd+QjnwYhZ8/4L5x2OnxIcJfDqD4xygTuaNtrqbUPrSPf ldIXB9lwJCaQqQdsLsjHIEKETF4akzBKSLiUkBSduGVBTRXr+c3NWZjPLeFS3U1ysTwU LT6UP3MRTwClXQNNuZcD481b4yr8GXHGpJ0dCkKylGANlsQY65OWJFR4xL4T66bIetr2 VsFVgJEbgmf5FlBbgDvQxW4USKUDRoAwI7Z+r5BBblgvYPJbY8/lgxJmViYVZKPVaOgl qisE8RdE4FhXF6IR4+wEna8q61bh2j5RhICYq7bQKDzwgZ+jTT3JSiWQCZpNQKx+4lYr EYKA== 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=jrxF7mJxfBPsc8LDzrDNvWnsv9aLo2sI9gR4zPBPsX4=; b=MiqaX+CxaGXi33E3v5cD4A8HTRkMmKDL9QGsGouHtYIceYCfA9+BTquzse221wahDA YiZTGkWrgeefgfy4wWC/EjirLJcjnM4HFKSG8VAv74tOrAGdZTHI5HtWKofJcmaGNJcp aJew/uaQy5+sefMBFYCoJlYuw9HAtoHI+b4j/PmrSE5AHruCUPSkAD/GHCLdeOQPgggd kIhcaYlINl1XcdzIPV2GSwEjwRSZ9iZ8yIFZ4i9J8jLxFKEBFgE9LSfSUGcYDBKp6AS/ 7GcexglzX8MNe48DXiS4WtymFUJycHysdZP4fDmOVMYgoIkr94XqEzbr47zTE16GvoRK crgA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=christian.storm@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id 7si300242wmg.4.2020.11.20.11.02.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Nov 2020 11:02:44 -0800 (PST) Received-SPF: pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 0AKJ2iZp026806 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 20 Nov 2020 20:02:44 +0100 Received: from MD1ZFJVC.ad001.siemens.net ([167.87.0.54]) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id 0AKJ2iKq007524; Fri, 20 Nov 2020 20:02:44 +0100 From: Christian Storm To: swupdate@googlegroups.com Cc: Christian Storm Subject: [swupdate] [PATCH] Don't run pre/post update commands in dry run mode Date: Fri, 20 Nov 2020 20:04:00 +0100 Message-Id: <20201120190400.91609-1-christian.storm@siemens.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-Original-Sender: christian.storm@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=christian.storm@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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: , Signed-off-by: Christian Storm --- core/installer.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/core/installer.c b/core/installer.c index 82b5d60..981a21d 100644 --- a/core/installer.c +++ b/core/installer.c @@ -469,8 +469,12 @@ void cleanup_files(struct swupdate_cfg *software) { int preupdatecmd(struct swupdate_cfg *swcfg) { if (swcfg) { - DEBUG("Running Pre-update command"); - return run_system_cmd(swcfg->globals.preupdatecmd); + if (swcfg->globals.dry_run) { + DEBUG("Dry run, skipping Pre-update command"); + } else { + DEBUG("Running Pre-update command"); + return run_system_cmd(swcfg->globals.preupdatecmd); + } } return 0; @@ -481,8 +485,13 @@ int postupdate(struct swupdate_cfg *swcfg, const char *info) swupdate_progress_done(info); if (swcfg) { - DEBUG("Running Post-update command"); - return run_system_cmd(swcfg->globals.postupdatecmd); + if (swcfg->globals.dry_run) { + DEBUG("Dry run, skipping Post-update command"); + } else { + DEBUG("Running Post-update command"); + return run_system_cmd(swcfg->globals.postupdatecmd); + } + } return 0;