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 20F131384C3 for ; Sat, 5 Sep 2015 16:19:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AAC30143BB; Sat, 5 Sep 2015 16:19:00 +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 1BE16143B8 for ; Sat, 5 Sep 2015 16:18:59 +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 416EB34076D for ; Sat, 5 Sep 2015 16:18:59 +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> From: Zac Medico Message-ID: <55EB15F0.3070107@gentoo.org> Date: Sat, 5 Sep 2015 09:18:56 -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: <20150905091604.4d71ff61.dolsen@gentoo.org> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Archives-Salt: 5685bd84-e579-4a4d-8fe0-3cb98f69e741 X-Archives-Hash: b227a3daac792a0087f9be53848962f5 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. -- Thanks, Zac