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

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

[Zac Medico]

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
---
 bin/repoman | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bin/repoman b/bin/repoman
index 1ba7841..ead4b69 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]):
+				# 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":
-- 
2.4.6

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

[Zac Medico]

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":
-- 
2.4.6

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

[Brian Dolbec]

On Sat,  5 Sep 2015 07:31:27 -0700
Zac Medico <zmedico@gentoo.org> 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

-- 
Brian Dolbec <dolsen>

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

[Zac Medico]

On 09/05/2015 09:16 AM, Brian Dolbec wrote:
> On Sat,  5 Sep 2015 07:31:27 -0700
> Zac Medico <zmedico@gentoo.org> 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

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

[Mike Gilbert]

On Sat, Sep 5, 2015 at 12:16 PM, Brian Dolbec <dolsen@gentoo.org> wrote:
> On Sat,  5 Sep 2015 07:31:27 -0700
> Zac Medico <zmedico@gentoo.org> 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.

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@gentoo.org> 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

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

[Brian Dolbec]

On Sat, 5 Sep 2015 15:47:50 -0400
Mike Gilbert <floppym@gentoo.org> wrote:

> On Sat, Sep 5, 2015 at 12:16 PM, Brian Dolbec <dolsen@gentoo.org>
> wrote:
> > On Sat,  5 Sep 2015 07:31:27 -0700
> > Zac Medico <zmedico@gentoo.org> 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.
> 

I've been busy with too many new things to get them all done.

I had thought I would have it merged already, but got distracted with
my new (used) dual xeon workstation. trying to get it running to take
over from my old core2 system.  Plus a few other things...

I have the new compression code ready for catalyst now too in the
pending branch for some final testing before merge.

I'll see if I can track down that regression, and submit it for final
review before merge.

Then we can patch it and progress with the rewrite at the same time.

-- 
Brian Dolbec <dolsen>

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

[Brian Dolbec]

On Sat, 5 Sep 2015 12:50:22 -0700
Zac Medico <zmedico@gentoo.org> wrote:

> 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@gentoo.org> 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.

I doubt you will be able to do a git rebase of old code patches onto
the new code.  It is just way too different.  most of the tests have
been removed from the main file and put into individual files. 

You'll likely have to hand apply them and adapt to the new code at the
same time.



-- 
Brian Dolbec <dolsen>

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

[Brian Dolbec]

On Sat, 5 Sep 2015 15:47:50 -0400
Mike Gilbert <floppym@gentoo.org> wrote:

> On Sat, Sep 5, 2015 at 12:16 PM, Brian Dolbec <dolsen@gentoo.org>
> wrote:
> > On Sat,  5 Sep 2015 07:31:27 -0700
> > Zac Medico <zmedico@gentoo.org> 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.
> 

Doh! I replied too soon, that is the very bug this patch was for, but
to the old code...

I'll port it to the rewrite then.

-- 
Brian Dolbec <dolsen>

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

[Brian Dolbec]

On Sat, 5 Sep 2015 14:24:37 -0700
Brian Dolbec <dolsen@gentoo.org> wrote:

> On Sat, 5 Sep 2015 15:47:50 -0400
> Mike Gilbert <floppym@gentoo.org> wrote:
> 
> > On Sat, Sep 5, 2015 at 12:16 PM, Brian Dolbec <dolsen@gentoo.org>
> > wrote:
> > > On Sat,  5 Sep 2015 07:31:27 -0700
> > > Zac Medico <zmedico@gentoo.org> 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.
> > 
> 
> Doh! I replied too soon, that is the very bug this patch was for, but
> to the old code...
> 
> I'll port it to the rewrite then.
> 

HA! turns out this patch applies to virgin code as far as the rewrite
was concerned.

It applied and rebased without a problem.

I pushed it to the repoman branch for more testing


-- 
Brian Dolbec <dolsen>