From patchwork Thu May 19 06:51:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 68087 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp3032400qge; Wed, 18 May 2016 23:52:11 -0700 (PDT) X-Received: by 10.194.205.105 with SMTP id lf9mr11316041wjc.25.1463640731128; Wed, 18 May 2016 23:52:11 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id p7si15773863wjv.144.2016.05.18.23.52.10; Wed, 18 May 2016 23:52:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 71084A75FB; Thu, 19 May 2016 08:52:04 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IvRv-uQKAzI3; Thu, 19 May 2016 08:52:04 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 48771A75FD; Thu, 19 May 2016 08:51:43 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 01C82A74E0 for ; Thu, 19 May 2016 08:51:31 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yhA2VWvLTLIF for ; Thu, 19 May 2016 08:51:30 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from conuserg-12.nifty.com (conuserg-12.nifty.com [210.131.2.79]) by theia.denx.de (Postfix) with ESMTPS id EACC9A74E9 for ; Thu, 19 May 2016 08:51:26 +0200 (CEST) Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id u4J6p2Zj001067; Thu, 19 May 2016 15:51:07 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com u4J6p2Zj001067 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1463640667; bh=exvIFOFVXqmYS27P5aOzHz8zE3z5w0YeqlmcirgH328=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hibNJuJrakC95KeALm8rcQMfgCwUpUxbvfFeV7kAqbadzReqFoIpBiZGVnJHfiVjF 1YYXjYc/0VcrU9rFGtS70G3wqWhuw7AJ6IWiYV4lSZpz6JAtkKNl4bCinbKzkgRRsq oAY9CNwcgp1Im86tuXxq4bpvMywrAUYsyWaWuE8Z0wESPAJQ1sCJ1yEWUxuMZlQm3+ ALenwOQ/9AAqZ19FU48LT7rN6Iaw5piIl8CHpwDk/y9zijwoUAcv/NLbOP1/QDKJGD WyNGNMCNVPHxtoPTBSuTCAc2iKMoM+4rezbrTfUWdnfvj3ZFQ1pA82KF5k041zcxs8 065FrguhQ6ZjQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Thu, 19 May 2016 15:51:54 +0900 Message-Id: <1463640729-25666-7-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1463640729-25666-1-git-send-email-yamada.masahiro@socionext.com> References: <1463640729-25666-1-git-send-email-yamada.masahiro@socionext.com> Cc: Joe Hershberger Subject: [U-Boot] [PATCH 06/21] tools: moveconfig: exit with error message for not clean directory X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" When the source tree is not clean, this tool raises an exception with a message like follows: Traceback (most recent call last): File "tools/moveconfig.py", line 939, in main() File "tools/moveconfig.py", line 934, in main move_config(config_attrs, options) File "tools/moveconfig.py", line 808, in move_config while not slots.available(): File "tools/moveconfig.py", line 733, in available if slot.poll(): File "tools/moveconfig.py", line 645, in poll self.parser.update_dotconfig(self.defconfig) File "tools/moveconfig.py", line 503, in update_dotconfig with open(autoconf_path) as f: IOError: [Errno 2] No such file or directory: '/tmp/tmpDtzCgl/include/autoconf.mk' This does not explain clearly what is wrong. Show an appropriate error message "srctree is not clean, please run 'make mrproper'" in such a situation. Signed-off-by: Masahiro Yamada --- tools/moveconfig.py | 8 ++++++++ 1 file changed, 8 insertions(+) -- 1.9.1 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/tools/moveconfig.py b/tools/moveconfig.py index 7e916c2..3da4726 100755 --- a/tools/moveconfig.py +++ b/tools/moveconfig.py @@ -252,6 +252,12 @@ def check_top_directory(): if not os.path.exists(f): sys.exit('Please run at the top of source directory.') +def check_clean_directory(): + """Exit if the source tree is not clean.""" + for f in ('.config', 'include/config'): + if os.path.exists(f): + sys.exit("srctree is not clean, please run 'make mrproper'") + def get_make_cmd(): """Get the command name of GNU Make. @@ -932,6 +938,8 @@ def main(): check_top_directory() + check_clean_directory() + update_cross_compile(options.color) if not options.cleanup_headers_only: