From patchwork Mon Aug 12 23:36:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Pagano X-Patchwork-Id: 2843320 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8D59CBF546 for ; Mon, 12 Aug 2013 23:42:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 821B52046B for ; Mon, 12 Aug 2013 23:42:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7B00120457 for ; Mon, 12 Aug 2013 23:42:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755911Ab3HLXmt (ORCPT ); Mon, 12 Aug 2013 19:42:49 -0400 Received: from 216.155.138.14.choopa.net ([216.155.138.14]:50504 "EHLO hopi.mpagano.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1752290Ab3HLXmt (ORCPT ); Mon, 12 Aug 2013 19:42:49 -0400 X-Greylist: delayed 396 seconds by postgrey-1.27 at vger.kernel.org; Mon, 12 Aug 2013 19:42:48 EDT Received: from localhost (localhost [127.0.0.1]) by hopi.mpagano.com (Postfix) with ESMTP id 4A9411D001F for ; Mon, 12 Aug 2013 19:35:44 -0400 (EDT) X-Virus-Scanned: amavisd-new at example.com Received: from hopi.mpagano.com ([127.0.0.1]) by localhost (mpagano.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LoAgqqTwscDp for ; Mon, 12 Aug 2013 19:35:38 -0400 (EDT) Received: from comanche.localnet (pool-96-234-78-247.nwrknj.fios.verizon.net [96.234.78.247]) by hopi.mpagano.com (Postfix) with ESMTPA id 2C3A11D0010 for ; Mon, 12 Aug 2013 19:35:38 -0400 (EDT) From: Mike Pagano To: linux-kbuild@vger.kernel.org Subject: [PATCH] kconfig: Update to diffconfig to support python 2.6 and greater Date: Mon, 12 Aug 2013 19:36:04 -0400 Message-ID: <2782016.fnisNIa02a@comanche> User-Agent: KMail/4.10.5 (Linux/3.10.5-gentoo; KDE/4.10.5; x86_64; ; ) MIME-Version: 1.0 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-9.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Modification of the diffconfig script to support python versions 2.6 and greater. Added a small change to gracefully exit if the default config files are not present. (.config and .config.old) Note that Linux distributions are starting to deprecate python versions < 2.5 Diffconfig is a utility script for comparing kernel configuration files. Signed-off-by: Mike Pagano Signed-off-by: Tobias Klausmann Signed-off-by: Ewoud Kohl van Wijngaarden --- scripts/diffconfig | 60 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/scripts/diffconfig b/scripts/diffconfig index b91f3e3..4829594 100755 --- a/scripts/diffconfig +++ b/scripts/diffconfig @@ -10,7 +10,7 @@ import sys, os def usage(): - print """Usage: diffconfig [-h] [-m] [ ] + print("""Usage: diffconfig [-h] [-m] [ ] Diffconfig is a simple utility for comparing two .config files. Using standard diff to compare .config files often includes extraneous and @@ -33,7 +33,7 @@ Example usage: EXT2_FS y -> n LOG_BUF_SHIFT 14 -> 16 PRINTK_TIME n -> y -""" +""") sys.exit(0) # returns a dictionary of name/value pairs for config items in the file @@ -54,23 +54,26 @@ def print_config(op, config, value, new_value): if merge_style: if new_value: if new_value=="n": - print "# CONFIG_%s is not set" % config + print("# CONFIG_%s is not set" % config) else: - print "CONFIG_%s=%s" % (config, new_value) + print("CONFIG_%s=%s" % (config, new_value)) else: if op=="-": - print "-%s %s" % (config, value) + print("-%s %s" % (config, value)) elif op=="+": - print "+%s %s" % (config, new_value) + print("+%s %s" % (config, new_value)) else: - print " %s %s -> %s" % (config, value, new_value) + print(" %s %s -> %s" % (config, value, new_value)) def main(): global merge_style + config_a = {} + config_b = {} + # parse command line args if ("-h" in sys.argv or "--help" in sys.argv): - usage() + usage() merge_style = 0 if "-m" in sys.argv: @@ -79,13 +82,13 @@ def main(): argc = len(sys.argv) if not (argc==1 or argc == 3): - print "Error: incorrect number of arguments or unrecognized option" + print("Error: incorrect number of arguments or unrecognized option") usage() if argc == 1: # if no filenames given, assume .config and .config.old build_dir="" - if os.environ.has_key("KBUILD_OUTPUT"): + if "KBUILD_OUTPUT" in os.environ: build_dir = os.environ["KBUILD_OUTPUT"]+"/" configa_filename = build_dir + ".config.old" @@ -94,36 +97,39 @@ def main(): configa_filename = sys.argv[1] configb_filename = sys.argv[2] - a = readconfig(file(configa_filename)) - b = readconfig(file(configb_filename)) + try: + config_a = readconfig(open(configa_filename)) + config_b = readconfig(open(configb_filename)) + except IOError as e: + print("I/O error({0}): {1}\n".format(e.errno, e.strerror)) + usage() - # print items in a but not b (accumulate, sort and print) + # print items in config_a but not config_b (accumulate, sort and print) old = [] - for config in a: - if config not in b: + for config in config_a: + if config not in config_b: old.append(config) old.sort() for config in old: - print_config("-", config, a[config], None) - del a[config] + print_config("-", config, config_a[config], None) + del config_a[config] # print items that changed (accumulate, sort, and print) changed = [] - for config in a: - if a[config] != b[config]: + for config in config_a: + if config_a[config] != config_b[config]: changed.append(config) else: - del b[config] + del config_b[config] changed.sort() for config in changed: - print_config("->", config, a[config], b[config]) - del b[config] + print_config("->", config, config_a[config], config_b[config]) + del config_b[config] - # now print items in b but not in a - # (items from b that were in a were removed above) - new = b.keys() - new.sort() + # now print items in config_b but not in config_a + # (items from config_b that were in config_a were removed above) + new = sorted(config_b.keys()) for config in new: - print_config("+", config, None, b[config]) + print_config("+", config, None, config_b[config]) main()