Re: [gentoo-portage-dev] [PATCH v2] repoman: ignore unadded files when possible (bug 559636)

[Zac Medico]

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 <zmedico@g.o> 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