From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1S2F9A-0006xi-AQ for garchives@archives.gentoo.org; Tue, 28 Feb 2012 04:58:44 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ECCBDE08BE; Tue, 28 Feb 2012 04:58:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BFCEFE08BE for ; Tue, 28 Feb 2012 04:58:27 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2A2941B4008 for ; Tue, 28 Feb 2012 04:58:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id F1D54E53FE for ; Tue, 28 Feb 2012 04:58:24 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1330405055.ef4fc7d5347e96e085c11d8843cceae1f433fe24.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/cvstree.py X-VCS-Directories: pym/portage/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: ef4fc7d5347e96e085c11d8843cceae1f433fe24 X-VCS-Branch: master Date: Tue, 28 Feb 2012 04:58:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 87cb78b0-2cdb-44ae-b60b-5365176e237d X-Archives-Hash: 2aa07eea85e15cb591188d370e5ef868 commit: ef4fc7d5347e96e085c11d8843cceae1f433fe24 Author: Zac Medico gentoo org> AuthorDate: Tue Feb 28 04:57:35 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Feb 28 04:57:35 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Def4fc7d5 cvstree.getentries: handle "ignored" files in cvs It's possible for files to be under version control even though they match our ignore filter, so don't ignore them if they are listed in the "Entries" file. Thanks to Mike Gilbert gentoo.org> for reporting in this blog post: http://floppym.blogspot.com/2012/02/cvs-status-display-cvs-checkout-in-sv= n.html --- pym/portage/cvstree.py | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pym/portage/cvstree.py b/pym/portage/cvstree.py index 9ba22f3..3680ae4 100644 --- a/pym/portage/cvstree.py +++ b/pym/portage/cvstree.py @@ -248,11 +248,13 @@ def getentries(mydir,recursive=3D0): if entries["files"][mysplit[1]]["revision"][0]=3D=3D"-": entries["files"][mysplit[1]]["status"]+=3D["removed"] =20 - for file in apply_cvsignore_filter(os.listdir(mydir)): + for file in os.listdir(mydir): if file=3D=3D"CVS": continue if os.path.isdir(mydir+"/"+file): if file not in entries["dirs"]: + if ignore_list.match(file) is not None: + continue entries["dirs"][file]=3D{"dirs":{},"files":{}} # It's normal for a directory to be unlisted in Entries # when checked out without -P (see bug #257660). @@ -266,6 +268,8 @@ def getentries(mydir,recursive=3D0): entries["dirs"][file]["status"]=3D["exists"] elif os.path.isfile(mydir+"/"+file): if file not in entries["files"]: + if ignore_list.match(file) is not None: + continue entries["files"][file]=3D{"revision":"","date":"","flags":"","tags":= ""} if "status" in entries["files"][file]: if "exists" not in entries["files"][file]["status"]: @@ -285,7 +289,9 @@ def getentries(mydir,recursive=3D0): print("failed to stat",file) print(e) return - =09 + + elif ignore_list.match(file) is not None: + pass else: print() print("File of unknown type:",mydir+"/"+file)