1 |
On Sat, 5 Sep 2015 15:47:50 -0400 |
2 |
Mike Gilbert <floppym@g.o> wrote: |
3 |
|
4 |
> On Sat, Sep 5, 2015 at 12:16 PM, Brian Dolbec <dolsen@g.o> |
5 |
> wrote: |
6 |
> > On Sat, 5 Sep 2015 07:31:27 -0700 |
7 |
> > Zac Medico <zmedico@g.o> wrote: |
8 |
> > |
9 |
> >> Unadded files that are excluded from the Manifest are safe to |
10 |
> >> ignore. |
11 |
> >> |
12 |
> >> X-Gentoo-Bug: 559636 |
13 |
> >> X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=559636 |
14 |
> >> --- |
15 |
> >> [PATCH v2] fixes it to properly check the find_invalid_path_char |
16 |
> >> return value bin/repoman | 6 +++++- |
17 |
> >> 1 file changed, 5 insertions(+), 1 deletion(-) |
18 |
> >> |
19 |
> >> diff --git a/bin/repoman b/bin/repoman |
20 |
> >> index 1ba7841..2c42c2d 100755 |
21 |
> >> --- a/bin/repoman |
22 |
> >> +++ b/bin/repoman |
23 |
> >> @@ -2570,7 +2570,11 @@ else: |
24 |
> >> if myunadded: |
25 |
> >> for x in range(len(myunadded)-1, -1, -1): |
26 |
> >> xs = myunadded[x].split("/") |
27 |
> >> - if xs[-1] == "files": |
28 |
> >> + if |
29 |
> >> repo_config.find_invalid_path_char(myunadded[x]) != -1: |
30 |
> >> + # The Manifest excludes this file, |
31 |
> >> + # so it's safe to ignore. |
32 |
> >> + del myunadded[x] |
33 |
> >> + elif xs[-1] == "files": |
34 |
> >> print("!!! files dir is not added! |
35 |
> >> Please correct this.") sys.exit(-1) |
36 |
> >> elif xs[-1] == "Manifest": |
37 |
> > |
38 |
> > uhg :( not another patch to "old" repoman code. |
39 |
> > |
40 |
> > I really want to get the rewrite code into portage master BEFORE any |
41 |
> > more patches, or changes are applied. There has been enough |
42 |
> > changes, that even the simplest small change can make it a rebase |
43 |
> > nightmare. |
44 |
> > |
45 |
> > At this point, I will only accept patches on the rewrite |
46 |
> |
47 |
> The rewrite has been sitting there for the better part of a year. Get |
48 |
> on with the merging already! |
49 |
> |
50 |
> Also, please see https://bugs.gentoo.org/show_bug.cgi?id=557864, which |
51 |
> is the only regression I have found so far. |
52 |
> |
53 |
|
54 |
I've been busy with too many new things to get them all done. |
55 |
|
56 |
I had thought I would have it merged already, but got distracted with |
57 |
my new (used) dual xeon workstation. trying to get it running to take |
58 |
over from my old core2 system. Plus a few other things... |
59 |
|
60 |
I have the new compression code ready for catalyst now too in the |
61 |
pending branch for some final testing before merge. |
62 |
|
63 |
I'll see if I can track down that regression, and submit it for final |
64 |
review before merge. |
65 |
|
66 |
Then we can patch it and progress with the rewrite at the same time. |
67 |
|
68 |
-- |
69 |
Brian Dolbec <dolsen> |