Skip to contentSkip to conversation

kconfig: Gracefully exit if the default config files are not present

PATCH Superseded Mike Pagano 2 participants 2 messages Aug 14, 2013 – Aug 15, 2013 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kconfig: Gracefully exit if the default config files are not present

Gracefully exit if the default config files are not present. (.config and .config.old)

Diffconfig is a utility script for comparing kernel configuration files.

---
 scripts/diffconfig | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
scripts/diffconfig +6 -2
index b91f3e3..33c696f 100755
@@ -94,8 +94,12 @@ def main():
         configa_filename = sys.argv[1]
         configb_filename = sys.argv[2]
 
-    a = readconfig(file(configa_filename))
-    b = readconfig(file(configb_filename))
+    try:
+        a = readconfig(file(configa_filename))
+        b = readconfig(file(configb_filename))
+    except IOError,(errno, strerror):
+       print "I/O error(%s: %s)\n" % (errno, strerror)
+       usage()
 
     # print items in a but not b (accumulate, sort and print)
     old = []
Signature · 1 line
1.8.1.5
#1 lore raw

Hi Mike,

Quoted 2 lines · Mike Pagano

Gracefully exit if the default config files are not present. (.config and .config.old)

Two minor nitpicks about the changelog: The subject line would be more to the point if it mentioned the name of the utility you are fixing. Otherwise, people might get the impression that you are fixing a tool from scripts/kconnfig, like 'make oldconfig' or 'make menuconfig'. Just change it to

diffconfig: Gracefully exit if the default config files are not present

Quoted 1 line

Diffconfig is a utility script for comparing kernel configuration files.

This is superfluous information. Just describe the change you made and that's it.

scripts/diffconfig def main(): · line 102

Quoted 8 lines
scripts/diffconfig +6 -2
-    a = readconfig(file(configa_filename))
-    b = readconfig(file(configb_filename))
+    try:
+        a = readconfig(file(configa_filename))
+        b = readconfig(file(configb_filename))
+    except IOError,(errno, strerror):
+       print "I/O error(%s: %s)\n" % (errno, strerror)
+       usage()

The second block is missing one column of indentation.

Michal