diff options
| author | Mike Frysinger <vapier@chromium.org> | 2015-10-16 17:15:29 -0400 |
|---|---|---|
| committer | Stephen Finucane <stephen.finucane@intel.com> | 2015-10-16 23:20:44 +0100 |
| commit | 703207007ebb7af48e359b64950aea0602d198b4 (patch) | |
| tree | 3d6dda010d518a488bad9f08b7593af87fcd55b6 | |
| parent | e13da7b7f05d1fc12d6315d99f945c91d4ae6353 (diff) | |
| download | patchwork-703207007ebb7af48e359b64950aea0602d198b4.tar patchwork-703207007ebb7af48e359b64950aea0602d198b4.tar.gz | |
pwclient: handle missing ~/.pwclientrc better
The upgrade path will crash if ~/.pwclientrc doesn't exist, so add an
explicit check for the file before we try to "upgrade" it.
The default error messages don't mention the config file, so it can be
a bit confusing what pwclient is complaining about when running.
Signed-off-by: Mike Frysinger <vapier@chromium.org>
Acked-by: Brian Norris <computersforpeace@gmail.com>
Reviewed-by: Stephen Finucane <stephen.finucane@hotmail.com>
| -rwxr-xr-x | patchwork/bin/pwclient | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patchwork/bin/pwclient b/patchwork/bin/pwclient index 8d1f476..46d11fb 100755 --- a/patchwork/bin/pwclient +++ b/patchwork/bin/pwclient @@ -569,7 +569,7 @@ def main(): config = ConfigParser.ConfigParser() config.read([CONFIG_FILE]) - if not config.has_section('options'): + if not config.has_section('options') and os.path.exists(CONFIG_FILE): sys.stderr.write('~/.pwclientrc is in the old format. Migrating it...') old_project = config.get('base','project') @@ -607,10 +607,10 @@ def main(): sys.exit(1) if not config.has_section(project_str): - sys.stderr.write("No section for project %s\n" % project_str) + sys.stderr.write('No section for project %s in ~/.pwclientrc\n' % project_str) sys.exit(1) if not config.has_option(project_str, 'url'): - sys.stderr.write("No URL for project %s\n" % project_str) + sys.stderr.write('No URL for project %s in ~/.pwclientrc\n' % project_str) sys.exit(1) if not do_signoff and config.has_option('options', 'signoff'): do_signoff = config.getboolean('options', 'signoff') |