| 1 |
On 09/05/2015 09:16 AM, Brian Dolbec wrote: |
| 2 |
> On Sat, 5 Sep 2015 07:31:27 -0700 |
| 3 |
> Zac Medico <zmedico@g.o> wrote: |
| 4 |
> |
| 5 |
>> Unadded files that are excluded from the Manifest are safe to ignore. |
| 6 |
>> |
| 7 |
>> X-Gentoo-Bug: 559636 |
| 8 |
>> X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=559636 |
| 9 |
>> --- |
| 10 |
>> [PATCH v2] fixes it to properly check the find_invalid_path_char |
| 11 |
>> return value bin/repoman | 6 +++++- |
| 12 |
>> 1 file changed, 5 insertions(+), 1 deletion(-) |
| 13 |
>> |
| 14 |
>> diff --git a/bin/repoman b/bin/repoman |
| 15 |
>> index 1ba7841..2c42c2d 100755 |
| 16 |
>> --- a/bin/repoman |
| 17 |
>> +++ b/bin/repoman |
| 18 |
>> @@ -2570,7 +2570,11 @@ else: |
| 19 |
>> if myunadded: |
| 20 |
>> for x in range(len(myunadded)-1, -1, -1): |
| 21 |
>> xs = myunadded[x].split("/") |
| 22 |
>> - if xs[-1] == "files": |
| 23 |
>> + if |
| 24 |
>> repo_config.find_invalid_path_char(myunadded[x]) != -1: |
| 25 |
>> + # The Manifest excludes this file, |
| 26 |
>> + # so it's safe to ignore. |
| 27 |
>> + del myunadded[x] |
| 28 |
>> + elif xs[-1] == "files": |
| 29 |
>> print("!!! files dir is not added! |
| 30 |
>> Please correct this.") sys.exit(-1) |
| 31 |
>> elif xs[-1] == "Manifest": |
| 32 |
> |
| 33 |
> uhg :( not another patch to "old" repoman code. |
| 34 |
> |
| 35 |
> I really want to get the rewrite code into portage master BEFORE any |
| 36 |
> more patches, or changes are applied. There has been enough changes, |
| 37 |
> that even the simplest small change can make it a rebase nightmare. |
| 38 |
> |
| 39 |
> At this point, I will only accept patches on the rewrite |
| 40 |
> |
| 41 |
|
| 42 |
Fair enough. I'll just rebase the patch after the rewrite is merged. |
| 43 |
-- |
| 44 |
Thanks, |
| 45 |
Zac |
Archives