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

[Zac Medico <zmedico@gentoo.org>]

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