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>

diff --git a/patchwork/bin/pwclient b/patchwork/bin/pwclient
index 8d1f4766c0bfe7b594e1b118c7348ba4f06af9d5..46d11fb7441fbddb6d46bf2387000672894a61ba 100755 (executable)
--- 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')