From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C1955138334 for ; Mon, 12 Aug 2019 07:37:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EFE85E077A; Mon, 12 Aug 2019 07:37:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CF4C6E077A for ; Mon, 12 Aug 2019 07:37:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9004634995C for ; Mon, 12 Aug 2019 07:37:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5F06B6DB for ; Mon, 12 Aug 2019 07:37:06 +0000 (UTC) From: "Michael Haubenwallner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Haubenwallner" Message-ID: <1565595317.ad09a180ae467a0eaf1da10e56adfb064b42691a.haubi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/prefix/windows/cygwin/ X-VCS-Repository: repo/gentoo X-VCS-Files: profiles/prefix/windows/cygwin/profile.bashrc X-VCS-Directories: profiles/prefix/windows/cygwin/ X-VCS-Committer: haubi X-VCS-Committer-Name: Michael Haubenwallner X-VCS-Revision: ad09a180ae467a0eaf1da10e56adfb064b42691a X-VCS-Branch: master Date: Mon, 12 Aug 2019 07:37:06 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1b29004f-2f4a-4fb6-aac0-648d920a6a48 X-Archives-Hash: f4b3d01b4459c2a85bbf0331df7640ab commit: ad09a180ae467a0eaf1da10e56adfb064b42691a Author: Michael Haubenwallner gentoo org> AuthorDate: Mon Aug 12 07:23:17 2019 +0000 Commit: Michael Haubenwallner gentoo org> CommitDate: Mon Aug 12 07:35:17 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad09a180 prefix/cygwin/profile.bashrc: preserve new dll list for rebase Do not overwrite the being merged new package's dll list for rebase with the being removed old package's dll list for just getting unmerged. This likely is the cause of some Prefix bootstraps to hang on Cygwin. Signed-off-by: Michael Haubenwallner gentoo.org> profiles/prefix/windows/cygwin/profile.bashrc | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/profiles/prefix/windows/cygwin/profile.bashrc b/profiles/prefix/windows/cygwin/profile.bashrc index aecfd9adb7c..9694edc101d 100644 --- a/profiles/prefix/windows/cygwin/profile.bashrc +++ b/profiles/prefix/windows/cygwin/profile.bashrc @@ -198,21 +198,14 @@ cygwin-rebase-merge() { } cygwin-rebase-post_pkg_prerm() { - # The pending list is installed as part of the package, but - # the merged list is not. Move from merged back to pending, - # in case the unmerge fails... - local pendingdir=$(cygwin-rebase-get_pendingdir) + # The pending list is registered as being installed with the package, but + # the merged list is not. Just remove the unregistered one. local mergeddir=$(cygwin-rebase-get_mergeddir) local listname=$(cygwin-rebase-get_listname) ( set -e cd "${EROOT}" [[ -w ./${mergeddir}/. ]] - [[ -w ./${pendingdir}/. ]] - if [[ -s ./${mergeddir}/${listname} ]] - then - mv -f "./${mergeddir}/${listname}" "./${pendingdir}/${listname}" || : - fi rm -f "./${mergeddir}/${listname}" ) }