From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1293366-garchives=archives.gentoo.org@lists.gentoo.org>
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 D588F1382C5
for <garchives@archives.gentoo.org>; Mon, 14 Jun 2021 06:28:36 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E0BADE0E7D;
Mon, 14 Jun 2021 06:28:35 +0000 (UTC)
Received: from smtp.gentoo.org (mail.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 B7AFFE0E7D
for <gentoo-commits@lists.gentoo.org>; Mon, 14 Jun 2021 06:28:35 +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 BB6E0340DA0
for <gentoo-commits@lists.gentoo.org>; Mon, 14 Jun 2021 06:28:34 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 5B921720
for <gentoo-commits@lists.gentoo.org>; Mon, 14 Jun 2021 06:28:33 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <1623651960.ac4f07b4b04aadf57f78cb21729e1f5439609f81.zmedico@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: man/, lib/_emerge/
X-VCS-Repository: proj/portage
X-VCS-Files: lib/_emerge/actions.py man/make.conf.5
X-VCS-Directories: man/ lib/_emerge/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: ac4f07b4b04aadf57f78cb21729e1f5439609f81
X-VCS-Branch: master
Date: Mon, 14 Jun 2021 06:28:33 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: a2f62ffd-5f8a-490b-a0d8-4e943e64b58a
X-Archives-Hash: 744a106dfce83bd7c8f701f2532b2c2a
commit: ac4f07b4b04aadf57f78cb21729e1f5439609f81
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 14 06:23:56 2021 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Jun 14 06:26:00 2021 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=ac4f07b4
Revert "PORTAGE_NICENESS: Consider autogroup scheduling"
This reverts commit a4d882964ee1931462f911d0c46a80e27e59fa48.
It triggered this regression:
# PORTAGE_NICENESS=20 emerge -av --depclean
OSError: [Errno 22] Invalid argument
During handling of the above exception, another exception occurred:
Traceback (most recent call last):
File "/usr/lib/python-exec/python3.9/emerge", line 51, in <module>
retval = emerge_main()
File "/usr/lib/python3.9/site-packages/_emerge/main.py", line 1319, in emerge_main
return run_action(emerge_config)
File "/usr/lib/python3.9/site-packages/_emerge/actions.py", line 2999, in run_action
apply_priorities(emerge_config.target_config.settings)
File "/usr/lib/python3.9/site-packages/_emerge/actions.py", line 2635, in apply_priorities
nice(settings)
File "/usr/lib/python3.9/site-packages/_emerge/actions.py", line 2672, in nice
out.eerror("%s\n" % str(e))
OSError: [Errno 22] Invalid argument
Bug: https://bugs.gentoo.org/777492#c4
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
lib/_emerge/actions.py | 36 +++---------------------------------
man/make.conf.5 | 10 +---------
2 files changed, 4 insertions(+), 42 deletions(-)
diff --git a/lib/_emerge/actions.py b/lib/_emerge/actions.py
index bfb08ed6b..1946f49df 100644
--- a/lib/_emerge/actions.py
+++ b/lib/_emerge/actions.py
@@ -14,7 +14,6 @@ import textwrap
import time
import warnings
from itertools import chain
-from pathlib import Path
import portage
portage.proxy.lazyimport.lazyimport(globals(),
@@ -2635,43 +2634,14 @@ def apply_priorities(settings):
nice(settings)
def nice(settings):
- nice_value: str = settings.get("PORTAGE_NICENESS", "0")
-
try:
- os.nice(int(nice_value))
+ os.nice(int(settings.get("PORTAGE_NICENESS", "0")))
except (OSError, ValueError) as e:
out = portage.output.EOutput()
- out.eerror(f"Failed to change nice value to {nice_value}")
+ out.eerror("Failed to change nice value to '%s'" % \
+ settings.get("PORTAGE_NICENESS", "0"))
out.eerror("%s\n" % str(e))
- autogroup_file = Path("/proc/self/autogroup")
- try:
- f = autogroup_file.open("r+")
- except EnvironmentError:
- # Autogroup scheduling is not enabled on this system.
- return
-
- with f:
- line = f.readline()
- original_autogroup_nice_value = line.split(" ")[2]
-
- # We need to restore the original nice value of the
- # autogroup, as otherwise the session, e.g. the
- # terminal where portage was executed in, would
- # continue running with that value.
- portage.atexit_register(
- lambda value: autogroup_file.write_text(value),
- original_autogroup_nice_value,
- )
-
- try:
- f.write(nice_value)
- except EnvironmentError as e:
- out = portage.output.EOutput()
- out.eerror(f"Failed to change autogroup's nice value to {nice_value}")
- out.eerror("%s\n" % str(e))
-
-
def ionice(settings):
ionice_cmd = settings.get("PORTAGE_IONICE_COMMAND")
diff --git a/man/make.conf.5 b/man/make.conf.5
index 18573b5e2..1c72109ad 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -1,4 +1,4 @@
-.TH "MAKE.CONF" "5" "Jun 2021" "Portage VERSION" "Portage"
+.TH "MAKE.CONF" "5" "May 2021" "Portage VERSION" "Portage"
.SH "NAME"
make.conf \- custom settings for Portage
.SH "SYNOPSIS"
@@ -1031,14 +1031,6 @@ The value of this variable will be added to the current nice level that
emerge is running at. In other words, this will not set the nice level,
it will increment it. For more information about nice levels and what
are acceptable ranges, see \fBnice\fR(1).
-.br
-If set and portage is run under Linux with autogroup scheduling (see
-\fBsched\fR(7)) enabled, then portage will set the nice value of its
-autogroup to PORTAGE_NICENESS. Upon exiting, portage will restore the
-original value. Note that if the function responsible for restoring the
-original value is not run, e.g., because portage's process was killed,
-then the autogroup will stay niced. In such a case, the value can be
-reset via corresponding autogroup pseudo\-file in /proc.
.TP
\fBPORTAGE_RO_DISTDIRS\fR = \fI[space delimited list of directories]\fR
When a given file does not exist in \fBDISTDIR\fR, search for the file