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 09EDD138334 for ; Thu, 9 Aug 2018 08:40:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DC464E0968; Thu, 9 Aug 2018 08:40:20 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 A5351E095D for ; Thu, 9 Aug 2018 08:40:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 27337335CAC for ; Thu, 9 Aug 2018 08:40:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1BC47380 for ; Thu, 9 Aug 2018 08:40:16 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1533804001.a75834757ba6574c49ade0c1c8edf00f56e05f07.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/base/ X-VCS-Repository: repo/gentoo X-VCS-Files: profiles/base/make.defaults X-VCS-Directories: profiles/base/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: a75834757ba6574c49ade0c1c8edf00f56e05f07 X-VCS-Branch: master Date: Thu, 9 Aug 2018 08:40:16 +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: fa8ab8ba-7029-4c5d-a4d5-4dcf9e67f391 X-Archives-Hash: 9891758e40517cb7fbc07461415ec5a8 commit: a75834757ba6574c49ade0c1c8edf00f56e05f07 Author: Michał Górny gentoo org> AuthorDate: Thu Aug 9 07:44:38 2018 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Aug 9 08:40:01 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7583475 profiles/base: Remove COLLISION_IGNORE for Python compiled mods Remove the obsolete COLLISION_IGNORE entries for compiled Python modules. Those entries were historically added to ease the migration from python.eclass to python-r1 which involved taking ownership of compiled module files. Nowadays they are rather irrelevant given that python.eclass is gone for a while, and protect-owned is the default. Also, the Jython variant happens to have invalid syntax. Closes: https://bugs.gentoo.org/663170 profiles/base/make.defaults | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults index 01744a72fa9..a0a1d4f977b 100644 --- a/profiles/base/make.defaults +++ b/profiles/base/make.defaults @@ -135,10 +135,9 @@ PYTHON_SINGLE_TARGET="python3_6" # Michał Górny (10 Aug 2013) # Moved from portage's make.globals. # 1) do not uninstall kernel modules and therefore allow replacing them, -# 2) allow replacing unowned compiled Python modules (python-r1 migration), -# 3) allow replacing unowned dropin.cache files (twisted-r1 migration). +# 2,3) removed wrt bug #663170, # 4) protect /var/{run,lock} symlinks for bug 519620 -COLLISION_IGNORE="/lib/modules/* *.py[co] *\$py.class */dropin.cache" +COLLISION_IGNORE="/lib/modules/*" UNINSTALL_IGNORE="/lib/modules/* /var/run /var/lock" # Andreas K. Hüttel (23 Aug 2013)