From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C3B921384C3 for ; Sat, 5 Sep 2015 19:50:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 241A014283; Sat, 5 Sep 2015 19:50:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 906761427A for ; Sat, 5 Sep 2015 19:50:26 +0000 (UTC) Received: from [192.168.0.13] (ip174-67-205-96.oc.oc.cox.net [174.67.205.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: zmedico) by smtp.gentoo.org (Postfix) with ESMTPSA id 8D5AB340688 for ; Sat, 5 Sep 2015 19:50:25 +0000 (UTC) Subject: Re: [gentoo-portage-dev] [PATCH v2] repoman: ignore unadded files when possible (bug 559636) To: gentoo-portage-dev@lists.gentoo.org References: <1441462844-3288-1-git-send-email-zmedico@gentoo.org> <1441463487-4101-1-git-send-email-zmedico@gentoo.org> <20150905091604.4d71ff61.dolsen@gentoo.org> <55EB15F0.3070107@gentoo.org> From: Zac Medico X-Enigmail-Draft-Status: N1110 Message-ID: <55EB477E.6090804@gentoo.org> Date: Sat, 5 Sep 2015 12:50:22 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.1.0 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org MIME-Version: 1.0 In-Reply-To: <55EB15F0.3070107@gentoo.org> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8bit X-Archives-Salt: b3a46857-d60a-4d75-9b5a-05fba67533bb X-Archives-Hash: 217707f7890ccc177561ad136c0ae878 On 09/05/2015 09:18 AM, Zac Medico wrote: > On 09/05/2015 09:16 AM, Brian Dolbec wrote: >> On Sat, 5 Sep 2015 07:31:27 -0700 >> Zac Medico wrote: >> >>> Unadded files that are excluded from the Manifest are safe to ignore. >>> >>> X-Gentoo-Bug: 559636 >>> X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=559636 >>> --- >>> [PATCH v2] fixes it to properly check the find_invalid_path_char >>> return value bin/repoman | 6 +++++- >>> 1 file changed, 5 insertions(+), 1 deletion(-) >>> >>> diff --git a/bin/repoman b/bin/repoman >>> index 1ba7841..2c42c2d 100755 >>> --- a/bin/repoman >>> +++ b/bin/repoman >>> @@ -2570,7 +2570,11 @@ else: >>> if myunadded: >>> for x in range(len(myunadded)-1, -1, -1): >>> xs = myunadded[x].split("/") >>> - if xs[-1] == "files": >>> + if >>> repo_config.find_invalid_path_char(myunadded[x]) != -1: >>> + # The Manifest excludes this file, >>> + # so it's safe to ignore. >>> + del myunadded[x] >>> + elif xs[-1] == "files": >>> print("!!! files dir is not added! >>> Please correct this.") sys.exit(-1) >>> elif xs[-1] == "Manifest": >> >> uhg :( not another patch to "old" repoman code. >> >> I really want to get the rewrite code into portage master BEFORE any >> more patches, or changes are applied. There has been enough changes, >> that even the simplest small change can make it a rebase nightmare. >> >> At this point, I will only accept patches on the rewrite >> > > Fair enough. I'll just rebase the patch after the rewrite is merged. > We could just keep all of the repoman patches in a special branch. Then for each release, just do a 'git rebase master' in that branch, and then tag the resulting branch head as a release. After the rewrite is merged, I'll manually rebase them all on the rewrite. -- Thanks, Zac