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