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 0897E1384C3 for ; Sat, 5 Sep 2015 19:48:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1FF0C14257; Sat, 5 Sep 2015 19:48:13 +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 6FDC514252 for ; Sat, 5 Sep 2015 19:48:12 +0000 (UTC) Received: from mail-ig0-f179.google.com (mail-ig0-f179.google.com [209.85.213.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: floppym) by smtp.gentoo.org (Postfix) with ESMTPSA id BD922340688 for ; Sat, 5 Sep 2015 19:48:11 +0000 (UTC) Received: by igbni9 with SMTP id ni9so35231301igb.0 for ; Sat, 05 Sep 2015 12:48:09 -0700 (PDT) X-Received: by 10.50.114.2 with SMTP id jc2mr18411970igb.81.1441482489754; Sat, 05 Sep 2015 12:48:09 -0700 (PDT) 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 Received: by 10.107.33.146 with HTTP; Sat, 5 Sep 2015 12:47:50 -0700 (PDT) In-Reply-To: <20150905091604.4d71ff61.dolsen@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: Mike Gilbert Date: Sat, 5 Sep 2015 15:47:50 -0400 Message-ID: Subject: Re: [gentoo-portage-dev] [PATCH v2] repoman: ignore unadded files when possible (bug 559636) To: gentoo-portage-dev@lists.gentoo.org Content-Type: text/plain; charset=UTF-8 X-Archives-Salt: 9960714d-0582-43b8-b965-0e52af085892 X-Archives-Hash: 9f476789be996c0b2445624c51224284 On Sat, Sep 5, 2015 at 12:16 PM, 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 The rewrite has been sitting there for the better part of a year. Get on with the merging already! Also, please see https://bugs.gentoo.org/show_bug.cgi?id=557864, which is the only regression I have found so far.