Gentoo Archives: gentoo-portage-dev

From: Zac Medico <zmedico@g.o>
To: gentoo-portage-dev@l.g.o
Cc: Zac Medico <zmedico@g.o>
Subject: [gentoo-portage-dev] [PATCH] repoman: ignore unadded files when possible (bug 559636)
Date: Sat, 05 Sep 2015 14:21:17
Message-Id: 1441462844-3288-1-git-send-email-zmedico@gentoo.org
1 Unadded files that are excluded from the Manifest are safe to ignore.
2
3 X-Gentoo-Bug: 559636
4 X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=559636
5 ---
6 bin/repoman | 6 +++++-
7 1 file changed, 5 insertions(+), 1 deletion(-)
8
9 diff --git a/bin/repoman b/bin/repoman
10 index 1ba7841..ead4b69 100755
11 --- a/bin/repoman
12 +++ b/bin/repoman
13 @@ -2570,7 +2570,11 @@ else:
14 if myunadded:
15 for x in range(len(myunadded)-1, -1, -1):
16 xs = myunadded[x].split("/")
17 - if xs[-1] == "files":
18 + if repo_config.find_invalid_path_char(myunadded[x]):
19 + # The Manifest excludes this file,
20 + # so it's safe to ignore.
21 + del myunadded[x]
22 + elif xs[-1] == "files":
23 print("!!! files dir is not added! Please correct this.")
24 sys.exit(-1)
25 elif xs[-1] == "Manifest":
26 --
27 2.4.6

Replies