| 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 |
[PATCH v2] fixes it to properly check the find_invalid_path_char return value |
| 7 |
bin/repoman | 6 +++++- |
| 8 |
1 file changed, 5 insertions(+), 1 deletion(-) |
| 9 |
|
| 10 |
diff --git a/bin/repoman b/bin/repoman |
| 11 |
index 1ba7841..2c42c2d 100755 |
| 12 |
--- a/bin/repoman |
| 13 |
+++ b/bin/repoman |
| 14 |
@@ -2570,7 +2570,11 @@ else: |
| 15 |
if myunadded: |
| 16 |
for x in range(len(myunadded)-1, -1, -1): |
| 17 |
xs = myunadded[x].split("/") |
| 18 |
- if xs[-1] == "files": |
| 19 |
+ if repo_config.find_invalid_path_char(myunadded[x]) != -1: |
| 20 |
+ # The Manifest excludes this file, |
| 21 |
+ # so it's safe to ignore. |
| 22 |
+ del myunadded[x] |
| 23 |
+ elif xs[-1] == "files": |
| 24 |
print("!!! files dir is not added! Please correct this.") |
| 25 |
sys.exit(-1) |
| 26 |
elif xs[-1] == "Manifest": |
| 27 |
-- |
| 28 |
2.4.6 |
Archives