password -> token.

diff --git a/coverity-submit b/coverity-submit
index a792fd0a7969e2cedc8e4c11df263722ebd29deb..fb98cf313cc06b25bc40aa77612a27e083f5b3da 100755 (executable)
--- a/coverity-submit
+++ b/coverity-submit
@@ -9,7 +9,7 @@ import os, sys, ConfigParser, getopt, tempfile, shutil
 version = "1.9"
 
 if __name__ == '__main__':
-    name = email = project = password = url = None
+    name = email = project = token = url = None
 
     config = ConfigParser.RawConfigParser()
     if os.path.exists(os.path.expanduser("~/.config/coverity-submit")):
@@ -62,10 +62,12 @@ if __name__ == '__main__':
         covname = config.get(project, "name")
     else:
         covname = project
-    if config.has_option(project, "password"):
-        password = config.get(project, "password")
+    if config.has_option(project, "token"):
+        token = config.get(project, "token")
+    elif config.has_option(project, "password"):
+        token = config.get(project, "password")
     else:
-        die("Every project requires a password option.")
+        die("Every project requires a token option.")
     if config.has_option(project, "email"):
         email = config.get(project, "email")
     elif config.has_option("ALL", "email"):
@@ -133,7 +135,7 @@ if __name__ == '__main__':
     do_or_die('''curl \
     --form file=@%(tmpdir)s/%(tarball)s \
     --form project=%(covname)s \
-    --form password=%(password)s \
+    --form token=%(token)s \
     --form email=%(email)s \
     --form version=%(build_version)s \
     --form description=%(description)s \

diff --git a/coverity-submit.xml b/coverity-submit.xml
index 39db61289d922b750cb2030f3c15e11ea8eb25fb..c5640a9f1590423801c3bc9140dd04f2017dec3e 100644 (file)
--- a/coverity-submit.xml
+++ b/coverity-submit.xml
@@ -52,20 +52,20 @@ email: esr@thyrsus.com
 tools: /usr/local/coverity/bin
 
 [gpsd]
-password: XXXXXX
+token: XXXXXX
 prebuild: scons -c
 build: scons
 postbuild: 
 
 [giflib]
-password: YYYYYYY
+token: YYYYYYY
 prebuild: autogen.sh && make clean
 build: make -k
 postbuild: 
 
 [cvs-fast-export]
 name: parsecvs
-password: ZZZZZZZ
+token: ZZZZZZZ
 prebuild: make clean
 build: make
 postbuild:
@@ -84,7 +84,7 @@ where to find it.</para>
 <para>This configuration describes three different (real) projects;
 one with an scons-based build, one with an autotools-based build, and
 one with a plain makefile build. For each project you must specify the
-Coverity build password and the local build command to pass to
+project's autentication token and the local build command to pass to
 cov-build. You may optionally specify local prebuild and postbuild
 commands.</para>
 
@@ -99,6 +99,10 @@ you register it.</para>
 options of versions 1.1 and previously are no longer needed, as
 Coverity has changed its submission form to support direct upload of
 the results tarball.</para>
+
+<para>For backward compatibity, 'password' is treated as a synonym for
+'token'; the change follows a change in the terminology of Coverity's
+configuration instructions.</para>
 </refsect1>
 <refsect1><title>OPERATION</title>