Commit 6bf2e84b8cebc4c53bf44343ed4e9b88aa73e34d
Committed by
Michal Marek
Michal Marek
1 parent
11097a0367
Exists in
master
and in
20 other branches
diffconfig: Gracefully exit if the default config files are not present
Handle gracefully the instance where config files are not present. Compatible with python versions 2.5, 2.6 and 2.7. The try/except is forward compatible with python version 3 once the entire script is ported. Signed-off-by: Mike Pagano <mpagano@gentoo.org> Signed-off-by: Michal Marek <mmarek@suse.cz>
Showing 1 changed file with 7 additions and 2 deletions Side-by-side Diff
scripts/diffconfig
| ... | ... | @@ -94,8 +94,13 @@ |
| 94 | 94 | configa_filename = sys.argv[1] |
| 95 | 95 | configb_filename = sys.argv[2] |
| 96 | 96 | |
| 97 | - a = readconfig(file(configa_filename)) | |
| 98 | - b = readconfig(file(configb_filename)) | |
| 97 | + try: | |
| 98 | + a = readconfig(file(configa_filename)) | |
| 99 | + b = readconfig(file(configb_filename)) | |
| 100 | + except (IOError): | |
| 101 | + e = sys.exc_info()[1] | |
| 102 | + print("I/O error[%s]: %s\n" % (e.args[0],e.args[1])) | |
| 103 | + usage() | |
| 99 | 104 | |
| 100 | 105 | # print items in a but not b (accumulate, sort and print) |
| 101 | 106 | old = [] |