From owner-svn-src-user@FreeBSD.ORG Sun Oct 28 12:12:45 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BBDF9E8C; Sun, 28 Oct 2012 12:12:45 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A417A8FC0A; Sun, 28 Oct 2012 12:12:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9SCCjK0002927; Sun, 28 Oct 2012 12:12:45 GMT (envelope-from crees@svn.freebsd.org) Received: (from crees@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9SCCjwE002925; Sun, 28 Oct 2012 12:12:45 GMT (envelope-from crees@svn.freebsd.org) Message-Id: <201210281212.q9SCCjwE002925@svn.freebsd.org> From: Chris Rees Date: Sun, 28 Oct 2012 12:12:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r242219 - user/crees/rclint X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Oct 2012 12:12:45 -0000 Author: crees (ports committer) Date: Sun Oct 28 12:12:45 2012 New Revision: 242219 URL: http://svn.freebsd.org/changeset/base/242219 Log: Check multiple keywords (an accidental omission) Allow $* in run_rc_command Modified: user/crees/rclint/rclint.py Modified: user/crees/rclint/rclint.py ============================================================================== --- user/crees/rclint/rclint.py Sun Oct 28 11:53:54 2012 (r242218) +++ user/crees/rclint/rclint.py Sun Oct 28 12:12:45 2012 (r242219) @@ -28,7 +28,7 @@ __version__ = '$FreeBSD$' MAJOR = 0 MINOR = 0 -MICRO = 2 +MICRO = 3 DATADIR = '.' @@ -194,7 +194,7 @@ class Rcorder: self.line = comment.line result = comment.match('# ([A-Z]+): (.+)') if result: - (self.type, self.value) = (result[0], result[1:]) + (self.type, self.value) = (result[0], result[1].split()) else: self.value = False @@ -416,7 +416,7 @@ def do_rclint(filename): logging.debug('Checking for run_rc_command') for s in lineobj['Statement']: if s.type == 'run_rc_command': - if '$1' not in s.value: + if '$1' not in s.value and '$*' not in s.value: error.give('run_rc_argument', s.line) # Strip .in from filename