From owner-svn-src-projects@FreeBSD.ORG Fri Jul 1 19:23:25 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D32BA106566B; Fri, 1 Jul 2011 19:23:25 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C31DA8FC13; Fri, 1 Jul 2011 19:23:25 +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 p61JNPrf003618; Fri, 1 Jul 2011 19:23:25 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p61JNPFP003616; Fri, 1 Jul 2011 19:23:25 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201107011923.p61JNPFP003616@svn.freebsd.org> From: Mark Linimon Date: Fri, 1 Jul 2011 19:23:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r223714 - projects/portbuild/qmanager X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Jul 2011 19:23:25 -0000 Author: linimon (doc,ports committer) Date: Fri Jul 1 19:23:25 2011 New Revision: 223714 URL: http://svn.freebsd.org/changeset/base/223714 Log: Add some error checking for corrupted INDEX lines. Modified: projects/portbuild/qmanager/packagebuild Modified: projects/portbuild/qmanager/packagebuild ============================================================================== --- projects/portbuild/qmanager/packagebuild Fri Jul 1 19:22:27 2011 (r223713) +++ projects/portbuild/qmanager/packagebuild Fri Jul 1 19:23:25 2011 (r223714) @@ -125,14 +125,18 @@ class Index(object): lines=[] print "[MASTER] Phase 1" for i in index: - (name, path, prefix, comment, descr, maintainer, categories, bdep, - rdep, www, edep, pdep, fdep) = i.rstrip().split("|") + try: + (name, path, prefix, comment, descr, maintainer, categories, bdep, + rdep, www, edep, pdep, fdep) = i.rstrip().split("|") - if targets is None or name in targets: - lines.append((name, bdep, rdep, edep, pdep, fdep)) + if targets is None or name in targets: + lines.append((name, bdep, rdep, edep, pdep, fdep)) - Port(name, path, "", "", "", "", - categories, "") + Port(name, path, "", "", "", "", + categories, "") + except Exception, e: + print "packagebuild.parse: bad line in INDEX: " + print i index = None del index