Support new-style config file location.

diff --git a/NEWS b/NEWS
index 556acf56336b3e243124d05e841fccf9c9d167f2..67cc8a08a5ef5db29e91ecf91b082a113e0d54cd 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
                        NEWS file for coverty-submit
 
+1.8 @ 2013-04-18
+    Support new-style config location, ~/.config/coverity-submit
+
 1.7 @ 2013-03-17
     Merge James Hunt's support for the build and tag options.
 

diff --git a/coverity-submit b/coverity-submit
index dcfcb6c52872d83f7b9efe0b645c349a820628b9..c87f3053b4d89b3933b68273886f7093246f3f77 100755 (executable)
--- a/coverity-submit
+++ b/coverity-submit
@@ -6,13 +6,16 @@
 #
 import os, sys, ConfigParser, getopt, tempfile
 
-version = "1.7"
+version = "1.8"
 
 if __name__ == '__main__':
     name = email = project = password = url = None
 
     config = ConfigParser.RawConfigParser()
-    config.read(os.path.expanduser("~/.coverity-submit"))
+    if os.path.exists(os.path.expanduser("~/.config/coverity-submit")):
+        config.read(os.path.expanduser("~/.config/coverity-submit"))
+    else:
+        config.read(os.path.expanduser("~/.coverity-submit"))
 
     def die(complaint):
         sys.stderr.write(complaint + "\n")

diff --git a/coverity-submit.xml b/coverity-submit.xml
index 0061bb9e2ce44e6031cb0ae22597a891fc391077..8e3472d661f7f18459faa474d634b1616656e72f 100644 (file)
--- a/coverity-submit.xml
+++ b/coverity-submit.xml
@@ -40,8 +40,9 @@ retrieving the request status.</para>
 <refsect1><title>CONFIGURATION</title>
 
 <para>To use this tool, you need to set up a configuration file named
-<filename>.coverity-submit</filename> in your home directory.  This
-configuration file is best explained by example.</para>
+either <filename>.coverity-submit</filename> or
+<filename>.config/coverity-submit</filename> in your home directory.
+This configuration file is best explained by example.</para>
 
 <programlisting>
 [ALL]