From patchwork Thu May 19 06:52:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 68101 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp3033321qge; Wed, 18 May 2016 23:54:56 -0700 (PDT) X-Received: by 10.194.171.7 with SMTP id aq7mr7781705wjc.8.1463640896330; Wed, 18 May 2016 23:54:56 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id yy1si15771601wjb.106.2016.05.18.23.54.56; Wed, 18 May 2016 23:54:56 -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 E5650A76D2; Thu, 19 May 2016 08:53:45 +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 7WYkn9GeripO; Thu, 19 May 2016 08:53:45 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D698FA7686; Thu, 19 May 2016 08:52:57 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 22C1AA7662 for ; Thu, 19 May 2016 08:52:41 +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 WHegV-_J8Xcr for ; Thu, 19 May 2016 08:52:41 +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 A60CEA765A for ; Thu, 19 May 2016 08:51:55 +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 u4J6p2Zw001067; Thu, 19 May 2016 15:51:17 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com u4J6p2Zw001067 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1463640677; bh=YSMOyRegjkVwziN7DSzSlLxZcdejijbkeKmIr2vrZow=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I8iUCzi8jk+8MmWnzgaDYDA5viJQew4eUo/T0j9VeY/oTDLXmJ1s4AXHtWdkas4m4 q5hWYf+9Mx5Xh2xmzO6wOcPxEQzCW/kMNA8aR5/GX4uqn78P3xeb1UibsqVmLIz5lB Nvm4A6P9hMDnTDNtHkG5l1OwAwxp1OSTu7AoLa4q3nfT8XsgfIhIlUpcqXYVSfxNv9 WzfiGW03/JTD3GkOu79vDJKjMHqFsCtN8X9A8ea7y5Vfr7wknJekOhO+a+t/qb4CFL bVeW00moogpGye14AAw68hF93f4nhE4+hWajAL2VAxDL+TgkcVLDp25xWyWP/CYRSn gi2QOSs7MWnvQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Thu, 19 May 2016 15:52:07 +0900 Message-Id: <1463640729-25666-20-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 19/21] tools: moveconfig: report when defconfig is updated 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" There are various factors that determine if the given defconfig is updated, and it is probably what users are more interested in. Show the log when the defconfig is updated. Also, copy the file only when the file content was really updated to avoid changing the time stamp needlessly. Signed-off-by: Masahiro Yamada --- tools/moveconfig.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) -- 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 9c73b30..65cc5b3 100755 --- a/tools/moveconfig.py +++ b/tools/moveconfig.py @@ -172,6 +172,7 @@ To see the complete list of supported options, run """ +import filecmp import fnmatch import multiprocessing import optparse @@ -717,9 +718,16 @@ class Slot: if self.state == STATE_SAVEDEFCONFIG: self.log += self.parser.check_defconfig() - if not self.options.dry_run: - shutil.move(os.path.join(self.build_dir, 'defconfig'), - os.path.join('configs', self.defconfig)) + orig_defconfig = os.path.join('configs', self.defconfig) + new_defconfig = os.path.join(self.build_dir, 'defconfig') + updated = not filecmp.cmp(orig_defconfig, new_defconfig) + + if updated: + self.log += color_text(self.options.color, COLOR_LIGHT_GREEN, + "defconfig was updated.\n") + + if not self.options.dry_run and updated: + shutil.move(new_defconfig, orig_defconfig) self.finish(True) return True