| 1 |
commit: ed40d1927d6bed3dc8f0cd5eb10e2bdc65397cfb |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 31 08:11:54 2015 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 31 08:14:17 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=ed40d192 |
| 7 |
|
| 8 |
qmerge: do not warn about missing symlinks when unmerging |
| 9 |
|
| 10 |
We were going to delete them anyways, so if they weren't found, it's |
| 11 |
not actually a problem we should warn about. |
| 12 |
|
| 13 |
qmerge.c | 7 +++++-- |
| 14 |
1 file changed, 5 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/qmerge.c b/qmerge.c |
| 17 |
index a3e2fd2..ddc0a10 100644 |
| 18 |
--- a/qmerge.c |
| 19 |
+++ b/qmerge.c |
| 20 |
@@ -1107,8 +1107,11 @@ pkg_unmerge(q_vdb_pkg_ctx *pkg_ctx, queue *keep) |
| 21 |
|
| 22 |
case CONTENTS_SYM: |
| 23 |
if (fstatat(portroot_fd, e->name + 1, &st, AT_SYMLINK_NOFOLLOW)) { |
| 24 |
- warnp("stat failed for %s -> '%s'", e->name, e->sym_target); |
| 25 |
- continue; |
| 26 |
+ if (errno != ENOENT) { |
| 27 |
+ warnp("stat failed for %s -> '%s'", e->name, e->sym_target); |
| 28 |
+ continue; |
| 29 |
+ } else |
| 30 |
+ break; |
| 31 |
} |
| 32 |
|
| 33 |
/* Hrm, if it isn't a symlink anymore, then leave it be */ |
Archives