From fe77196f8d028c46d2619beae16a8ce67d4d2edf Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Tue, 3 Jun 2014 19:33:23 -0400
Subject: [PATCH] Adapt for new pylint.

---
 Makefile        | 11 +++++++----
 control         |  4 +++-
 coverity-submit |  6 ++++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index a5201b3..e4aa40d 100644
--- a/Makefile
+++ b/Makefile
@@ -34,15 +34,18 @@ pychecker:
 	@-pychecker --only --limit 50 coverity-submit.py
 	@rm -f coverity-submit.py
 
-PYLINTOPTS = --rcfile=/dev/null --reports=n --include-ids=y --disable="C0103,C0111,C0301"
+PYLINTOPTS = --rcfile=/dev/null --reports=n \
+	--msg-template="{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}" \
+	--dummy-variables-rgx='^_'
+SUPPRESSIONS = --disable="C0103,C0111,C0301"
 pylint:
-	@pylint --output-format=parseable $(PYLINTOPTS) coverity-submit
+	@pylint $(PYLINTOPTS) $(SUPPRESSIONS) coverity-submit
 
 clean:
-	rm -f *.pyc *.html coverity-submit.1 MANIFEST ChangeLog SHIPPER.* *~
+	rm -f *.pyc *.html coverity-submit.1 MANIFEST ChangeLog
 	rm -f *.tar.gz *.md5
 
 dist: coverity-submit-$(VERS).tar.gz
 
 release: coverity-submit-$(VERS).tar.gz coverity-submit-$(VERS).md5 coverity-submit.html
-	shipper -u -m -t; make clean
+	shipper version=$(VERS) | sh -e -x
diff --git a/control b/control
index ed38a9d..ad0507d 100644
--- a/control
+++ b/control
@@ -20,6 +20,8 @@ XBS-Ohloh-URL: https://www.ohloh.net/p/coverity-submit
 
 Homepage: http://www.catb.org/~esr/coverity-submit
 
+XBS-HTML-Target: index.html
+
 XBS-Logo: coverity-submit.png
 
- 
+XBS-VC-Tag-Template: %(version)s
diff --git a/coverity-submit b/coverity-submit
index fb856bb..9092886 100755
--- a/coverity-submit
+++ b/coverity-submit
@@ -4,6 +4,8 @@
 #
 # By Eric S. Raymond, May 2012.  BSD terms apply.
 #
+from __future__ import print_function
+
 import os, pwd, sys, ConfigParser, getopt, tempfile, shutil, datetime, commands
 
 version = "1.12"
@@ -25,7 +27,7 @@ def commit_id():
 
 def deduce_name():
     "Deduce user's full name."
-    if 'USERNAME' in os.environ: 
+    if 'USERNAME' in os.environ:
         p = pwd.getpwnam(os.environ['USERNAME'])
     elif 'LOGNAME' in os.environ:
         p = pwd.getpwnam(os.environ['LOGNAME'])
@@ -35,7 +37,7 @@ def deduce_name():
 
 def deduce_userid():
     "Deduce user's (local) username."
-    if 'USERNAME' in os.environ: 
+    if 'USERNAME' in os.environ:
         p = pwd.getpwnam(os.environ['USERNAME'])
     elif 'LOGNAME' in os.environ:
         p = pwd.getpwnam(os.environ['LOGNAME'])
-- 
2.43.0