commit:     ed40d1927d6bed3dc8f0cd5eb10e2bdc65397cfb
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 08:11:54 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun May 31 08:14:17 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=ed40d192

qmerge: do not warn about missing symlinks when unmerging

We were going to delete them anyways, so if they weren't found, it's
not actually a problem we should warn about.

 qmerge.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/qmerge.c b/qmerge.c
index a3e2fd2..ddc0a10 100644
--- a/qmerge.c
+++ b/qmerge.c
@@ -1107,8 +1107,11 @@ pkg_unmerge(q_vdb_pkg_ctx *pkg_ctx, queue *keep)
 
                        case CONTENTS_SYM:
                                if (fstatat(portroot_fd, e->name + 1, &st, 
AT_SYMLINK_NOFOLLOW)) {
-                                       warnp("stat failed for %s -> '%s'", 
e->name, e->sym_target);
-                                       continue;
+                                       if (errno != ENOENT) {
+                                               warnp("stat failed for %s -> 
'%s'", e->name, e->sym_target);
+                                               continue;
+                                       } else
+                                               break;
                                }
 
                                /* Hrm, if it isn't a symlink anymore, then 
leave it be */

Reply via email to