diff options
| author | Mike Pagano <mpagano@gentoo.org> | 2013-08-16 14:40:56 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2013-08-19 22:33:32 +0200 |
| commit | 6bf2e84b8cebc4c53bf44343ed4e9b88aa73e34d (patch) | |
| tree | c030d050ac801da1f7f82ba4439e7e4577883531 | |
| parent | 11097a0367e48954ecf616f9b0df48d86835dd0d (diff) | |
| download | linux-stable-6bf2e84b8cebc4c53bf44343ed4e9b88aa73e34d.tar.gz linux-stable-6bf2e84b8cebc4c53bf44343ed4e9b88aa73e34d.tar.bz2 linux-stable-6bf2e84b8cebc4c53bf44343ed4e9b88aa73e34d.zip | |
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>
| -rwxr-xr-x | scripts/diffconfig | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/diffconfig b/scripts/diffconfig index b91f3e34d44d..0ee65839f7aa 100755 --- a/scripts/diffconfig +++ b/scripts/diffconfig @@ -94,8 +94,13 @@ 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): + e = sys.exc_info()[1] + print("I/O error[%s]: %s\n" % (e.args[0],e.args[1])) + usage() # print items in a but not b (accumulate, sort and print) old = [] |