From owner-svn-src-user@FreeBSD.ORG Wed Mar 26 17:43:25 2014 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5453E4B9; Wed, 26 Mar 2014 17:43:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 41CD91E4; Wed, 26 Mar 2014 17:43:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2QHhPPX004284; Wed, 26 Mar 2014 17:43:25 GMT (envelope-from crees@svn.freebsd.org) Received: (from crees@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2QHhPFP004283; Wed, 26 Mar 2014 17:43:25 GMT (envelope-from crees@svn.freebsd.org) Message-Id: <201403261743.s2QHhPFP004283@svn.freebsd.org> From: Chris Rees Date: Wed, 26 Mar 2014 17:43:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r263773 - 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.17 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: Wed, 26 Mar 2014 17:43:25 -0000 Author: crees (doc,ports committer) Date: Wed Mar 26 17:43:24 2014 New Revision: 263773 URL: http://svnweb.freebsd.org/changeset/base/263773 Log: Give the line number of the first out-of-order line found. Modified: user/crees/rclint/rclint.py Modified: user/crees/rclint/rclint.py ============================================================================== --- user/crees/rclint/rclint.py Wed Mar 26 17:40:13 2014 (r263772) +++ user/crees/rclint/rclint.py Wed Mar 26 17:43:24 2014 (r263773) @@ -27,8 +27,8 @@ __version__ = '$FreeBSD$' MAJOR = 0 -MINOR = 0 -MICRO = 6 +MINOR = 1 +MICRO = 0 DATADIR = '.' @@ -361,8 +361,14 @@ def do_rclint(filename): if s.type == 'run_rc_command': linenumbers.append(s.line) - if sorted(linenumbers) != linenumbers: - error.give('file_order') + # Check lines are in the correct order + + sortedlinenumbers = sorted(linenumbers) + + for i in range(0, len(linenumbers)): + if sortedlinenumbers[i] != linenumbers[i]: + error.give('file_order', linenumbers[i]) + break logging.debug('Checking all lines are accounted for') for obj in list(lineobj.keys()):