Message ID | 20190720182416.183626-46-sjg@chromium.org |
---|---|
State | Accepted |
Commit | 313533018dc175a5552a8ccac9d6bcd780e824df |
Delegated to: | Simon Glass |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="bONtU9+M"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45rcBv6Pdlz9s7T for <incoming@patchwork.ozlabs.org>; Sun, 21 Jul 2019 04:40:55 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 99878C21C2F; Sat, 20 Jul 2019 18:31:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 0EE30C21C50; Sat, 20 Jul 2019 18:26:01 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C84A9C21E50; Sat, 20 Jul 2019 18:25:32 +0000 (UTC) Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) by lists.denx.de (Postfix) with ESMTPS id CC133C21D8A for <u-boot@lists.denx.de>; Sat, 20 Jul 2019 18:25:26 +0000 (UTC) Received: by mail-io1-f67.google.com with SMTP id j5so61077081ioj.8 for <u-boot@lists.denx.de>; Sat, 20 Jul 2019 11:25:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1JX6sBgRh3JengtdI76EFlCNgfflfoGAqQPDpKQjHeg=; b=bONtU9+MXqqUYyUdH/jLseyjW0on4f4FExsoIVZRMnIy7B0eA3f3sudzPT3uRd91wm YJUlv1OEuTXdFPqVVJYQFHON2oyTsftlCuk4QPpM/6Xw2k/sWClYrUAimrc1PMKR8tye yWucW/JYQqkLoVVRzr/m/i6WpbaogmoiEXQyM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1JX6sBgRh3JengtdI76EFlCNgfflfoGAqQPDpKQjHeg=; b=CH7S5+QrGpueT8Q5GzGbdgB3qzhZaHgFO4JKzKbhFY0hRQ+vbZIHpPcS+8OaKWCHQK gwK8LNCTH+BOTBdz9na4H1qx165rXy4QEKXVp8qcwFBZATLy0I/tqtmTIACGZ3o/QlBR 5fYcNXDLkANQs9e27QFYQkLCywnh6iRI4AanzFt2b4AHkhusNa3UHag3tfvxNK4tpgDg o3kWj+IsYk2XpBSr9sDqjDVGgjXzXjFhYDDrBnYapMftmNYxTaHyWofrt2woeThFd5ul O0kPZquhYhDmZFLa7TcdnHUzUfopAygJAJevASHX/ifHpMyaICg8WtHay2E7zggntmjc J4wg== X-Gm-Message-State: APjAAAXH3s5xvWlUex939C/grp5k39CjwOFcLos0HSDsOnTHLjF9S92i 2Db6GISjjO6Wov7c5Hbi8vk4gov+KQw= X-Google-Smtp-Source: APXvYqzSi7jvEx9rrzxdA6mkHNcXuOGIhEA9uSoRRtcauXyHqzHlvY2EFq56Fz0nSkOZyLNGo3XvBA== X-Received: by 2002:a05:6638:38f:: with SMTP id y15mr6899878jap.143.1563647125719; Sat, 20 Jul 2019 11:25:25 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id z17sm49778933iol.73.2019.07.20.11.25.25 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sat, 20 Jul 2019 11:25:25 -0700 (PDT) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Date: Sat, 20 Jul 2019 12:24:07 -0600 Message-Id: <20190720182416.183626-46-sjg@chromium.org> X-Mailer: git-send-email 2.22.0.657.g960e92d24f-goog In-Reply-To: <20190720182416.183626-1-sjg@chromium.org> References: <20190720182416.183626-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 45/53] patman: Reset the output directory when it is removed X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <http://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> |
Series |
binman: Support replacing entries in an existing image
|
expand
|
At present outdir remains set ever after the output directory has been
removed. Fix this to avoid trying to access it when it is not present.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
tools/patman/tools.py | 2 ++
1 file changed, 2 insertions(+)
Applied to u-boot-dm, thanks!
diff --git a/tools/patman/tools.py b/tools/patman/tools.py index d615227482a..0d4705db760 100644 --- a/tools/patman/tools.py +++ b/tools/patman/tools.py @@ -83,6 +83,7 @@ def FinaliseOutputDir(): """Tidy up: delete output directory if temporary and not preserved.""" if outdir and not preserve_outdir: _RemoveOutputDir() + outdir = None def GetOutputFilename(fname): """Return a filename within the output directory. @@ -101,6 +102,7 @@ def _FinaliseForTest(): if outdir: _RemoveOutputDir() + outdir = None def SetInputDirs(dirname): """Add a list of input directories, where input files are kept.
At present outdir remains set ever after the output directory has been removed. Fix this to avoid trying to access it when it is not present. Signed-off-by: Simon Glass <sjg@chromium.org> --- tools/patman/tools.py | 2 ++ 1 file changed, 2 insertions(+)