From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CB3CB138CDC for ; Sun, 31 May 2015 08:31:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6CD08E0872; Sun, 31 May 2015 08:31:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1737EE0872 for ; Sun, 31 May 2015 08:31:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 57DD2340BCD for ; Sun, 31 May 2015 08:31:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 16CFAA0A for ; Sun, 31 May 2015 08:31:43 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1433060057.ed40d1927d6bed3dc8f0cd5eb10e2bdc65397cfb.vapier@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: / X-VCS-Repository: proj/portage-utils X-VCS-Files: qmerge.c X-VCS-Directories: / X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: ed40d1927d6bed3dc8f0cd5eb10e2bdc65397cfb X-VCS-Branch: master Date: Sun, 31 May 2015 08:31:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 59cc7e8e-433d-4d75-a9dc-09b2435ffbe6 X-Archives-Hash: 0cc93e0a7903b4d7d473fe4aa45a14e1 commit: ed40d1927d6bed3dc8f0cd5eb10e2bdc65397cfb Author: Mike Frysinger gentoo org> AuthorDate: Sun May 31 08:11:54 2015 +0000 Commit: Mike Frysinger gentoo 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 */