Gentoo Archives: gentoo-portage-dev

From: "M. J. Everitt" <m.j.everitt@×××.org>
To: gentoo-portage-dev@l.g.o
Subject: [gentoo-portage-dev] [PATCH 1/4] Renamed PORT_LOGDIR[_CLEAN] to PORTAGE_LOGDIR[_CLEAN]
Date: Sat, 15 Dec 2018 02:25:43
Message-Id: 82d562b1-97cc-969d-e122-032d8f7f9de1@iee.org
1 To match similar existing PORTAGE_* variables
2
3 Suggested-by: Zac Medico <zmedico@g.o>
4 Acked-by: Michael Everitt <m.j.everitt@×××.org>
5 Bug: https://bugs.gentoo.org/668538
6 ---
7 NEWS | 2 +-
8 cnf/make.conf.example | 12 +++++-----
9 cnf/make.globals | 2 +-
10 lib/_emerge/post_emerge.py | 2 +-
11 lib/portage/dbapi/vartree.py | 2 +-
12 lib/portage/elog/mod_echo.py | 2 +-
13 lib/portage/elog/mod_save.py | 4 ++--
14 lib/portage/elog/mod_save_summary.py | 4 ++--
15 lib/portage/emaint/modules/logs/__init__.py | 2 +-
16 lib/portage/emaint/modules/logs/logs.py | 22 +++++++++---------
17 .../package/ebuild/_config/special_env_vars.py | 2 +-
18 lib/portage/package/ebuild/prepare_build_dirs.py | 26 +++++++++++-----------
19 lib/portage/tests/emerge/test_simple.py | 2 +-
20 man/ebuild.5 | 2 +-
21 man/emaint.1 | 6 ++---
22 man/emerge.1 | 2 +-
23 man/make.conf.5 | 18 +++++++--------
24 17 files changed, 56 insertions(+), 56 deletions(-)
25
26 diff --git a/NEWS b/NEWS
27 index f77c310e3..b430f273f 100644
28 --- a/NEWS
29 +++ b/NEWS
30 @@ -389,7 +389,7 @@ portage-2.1 (ongoing via pre releases)
31 * Make --emptytree only apply to ${ROOT} rather than always including /.
32 * Allow packages to be upgraded that are only depended on via a
33 "|| ( =cat/pkg-1* =cat/pkg-2* )" construct.
34 -* Ebuild output is no longer cut off early when using PORT_LOGDIR.
35 +* Ebuild output is no longer cut off early when using PORTAGE_LOGDIR.
36 * Distfiles indirection- $DISTFILES access goes through a tmp dir to fail
37 access to files not listed in SRC_URI.
38 * Emerge now uses --resume to restart itself after portage upgrade.
39 diff --git a/cnf/make.conf.example b/cnf/make.conf.example
40 index 36fc9a8e4..ffebd24d4 100644
41 --- a/cnf/make.conf.example
42 +++ b/cnf/make.conf.example
43 @@ -130,13 +130,13 @@
44 # storage. See the PORTDIR documentation for more information.
45 #PKGDIR=/usr/portage/packages
46 #
47 -# PORT_LOGDIR is the location where portage will store all the logs it
48 +# PORTAGE_LOGDIR is the location where portage will store all the logs it
49 # creates from each individual merge. They are stored as
50 # ${CATEGORY}:${PF}:YYYYMMDD-HHMMSS.log in the directory specified.
51 # If the directory does not exist, it will be created automatically and
52 # group permissions will be applied to it. If the directory already
53 # exists, portage will not modify its permissions.
54 -#PORT_LOGDIR=""
55 +#PORTAGE_LOGDIR=""
56 #
57 # PORTDIR_OVERLAY is a directory where local ebuilds may be stored without
58 # concern that they will be deleted by rsync updates. Default is not
59 @@ -306,16 +306,16 @@
60 # PORTAGE_ELOG_SYSTEM: selects the module(s) to process the log messages. Modules
61 # included in portage are (empty means logging is disabled):
62 # echo (display messages again when emerge exits)
63 -# save (saves one log per package in $PORT_LOGDIR/elog,
64 -# /var/log/portage/elog if $PORT_LOGDIR is unset)
65 +# save (saves one log per package in $PORTAGE_LOGDIR/elog,
66 +# /var/log/portage/elog if $PORTAGE_LOGDIR is unset)
67 # custom (passes all messages to $PORTAGE_ELOG_COMMAND)
68 # syslog (sends all messages to syslog)
69 # mail (send all messages to the mailserver defined
70 # in $PORTAGE_ELOG_MAILURI)
71 # save_summary (like "save" but merges all messages
72 -# in $PORT_LOGDIR/elog/summary.log,
73 +# in $PORTAGE_LOGDIR/elog/summary.log,
74 # /var/log/portage/elog/summary.log if
75 -# $PORT_LOGDIR is unset)
76 +# $PORTAGE_LOGDIR is unset)
77 # mail_summary (like "mail" but sends all messages in
78 # a single mail when emerge exits)
79 # To use elog you should enable at least one module
80 diff --git a/cnf/make.globals b/cnf/make.globals
81 index 1bcc7ce64..5a3015ae2 100644
82 --- a/cnf/make.globals
83 +++ b/cnf/make.globals
84 @@ -101,7 +101,7 @@ PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-
85 PORTAGE_SYNC_STALE="30"
86
87 # Executed before emerge exit if FEATURES=clean-logs is enabled.
88 -PORT_LOGDIR_CLEAN="find \"\${PORT_LOGDIR}\" -type f ! -name \"summary.log*\" -mtime +7 -delete"
89 +PORTAGE_LOGDIR_CLEAN="find \"\${PORTAGE_LOGDIR}\" -type f ! -name \"summary.log*\" -mtime +7 -delete"
90
91 # Minimal CONFIG_PROTECT
92 CONFIG_PROTECT="/etc"
93 diff --git a/lib/_emerge/post_emerge.py b/lib/_emerge/post_emerge.py
94 index 7e6063c52..e971cf40d 100644
95 --- a/lib/_emerge/post_emerge.py
96 +++ b/lib/_emerge/post_emerge.py
97 @@ -24,7 +24,7 @@ def clean_logs(settings):
98 if "clean-logs" not in settings.features:
99 return
100
101 - logdir = settings.get("PORT_LOGDIR")
102 + logdir = settings.get("PORTAGE_LOGDIR")
103 if logdir is None or not os.path.isdir(logdir):
104 return
105
106 diff --git a/lib/portage/dbapi/vartree.py b/lib/portage/dbapi/vartree.py
107 index fd8aaeb8e..9febf0c71 100644
108 --- a/lib/portage/dbapi/vartree.py
109 +++ b/lib/portage/dbapi/vartree.py
110 @@ -2225,7 +2225,7 @@ class dblink(object):
111 # Restore this since it gets lost somewhere above and it
112 # needs to be set for _display_merge() to be able to log.
113 # Note that the log isn't necessarily supposed to exist
114 - # since if PORT_LOGDIR is unset then it's a temp file
115 + # since if PORTAGE_LOGDIR is unset then it's a temp file
116 # so it gets cleaned above.
117 self.settings["PORTAGE_LOG_FILE"] = log_path
118 else:
119 diff --git a/lib/portage/elog/mod_echo.py b/lib/portage/elog/mod_echo.py
120 index fb86547a4..8cdf6ac7d 100644
121 --- a/lib/portage/elog/mod_echo.py
122 +++ b/lib/portage/elog/mod_echo.py
123 @@ -20,7 +20,7 @@ def process(mysettings, key, logentries, fulltext):
124 # output logfile explicitly only if it isn't in tempdir, otherwise
125 # it will be removed anyway
126 if (key == mysettings.mycpv and
127 - "PORT_LOGDIR" in mysettings and
128 + "PORTAGE_LOGDIR" in mysettings and
129 "PORTAGE_LOG_FILE" in mysettings):
130 logfile = mysettings["PORTAGE_LOG_FILE"]
131 _items.append((mysettings["ROOT"], key, logentries, logfile))
132 diff --git a/lib/portage/elog/mod_save.py b/lib/portage/elog/mod_save.py
133 index 829ec6c5e..a98ca9377 100644
134 --- a/lib/portage/elog/mod_save.py
135 +++ b/lib/portage/elog/mod_save.py
136 @@ -16,8 +16,8 @@ from portage.util import apply_permissions, ensure_dirs, normalize_path
137
138 def process(mysettings, key, logentries, fulltext):
139
140 - if mysettings.get("PORT_LOGDIR"):
141 - logdir = normalize_path(mysettings["PORT_LOGDIR"])
142 + if mysettings.get("PORTAGE_LOGDIR"):
143 + logdir = normalize_path(mysettings["PORTAGE_LOGDIR"])
144 else:
145 logdir = os.path.join(os.sep, mysettings["EPREFIX"].lstrip(os.sep),
146 "var", "log", "portage")
147 diff --git a/lib/portage/elog/mod_save_summary.py b/lib/portage/elog/mod_save_summary.py
148 index 786f89454..e4924b66b 100644
149 --- a/lib/portage/elog/mod_save_summary.py
150 +++ b/lib/portage/elog/mod_save_summary.py
151 @@ -19,8 +19,8 @@ from portage.package.ebuild.prepare_build_dirs import _ensure_log_subdirs
152 from portage.util import apply_permissions, ensure_dirs, normalize_path
153
154 def process(mysettings, key, logentries, fulltext):
155 - if mysettings.get("PORT_LOGDIR"):
156 - logdir = normalize_path(mysettings["PORT_LOGDIR"])
157 + if mysettings.get("PORTAGE_LOGDIR"):
158 + logdir = normalize_path(mysettings["PORTAGE_LOGDIR"])
159 else:
160 logdir = os.path.join(os.sep, mysettings["EPREFIX"].lstrip(os.sep),
161 "var", "log", "portage")
162 diff --git a/lib/portage/emaint/modules/logs/__init__.py b/lib/portage/emaint/modules/logs/__init__.py
163 index 5b78d71ff..ab83155e3 100644
164 --- a/lib/portage/emaint/modules/logs/__init__.py
165 +++ b/lib/portage/emaint/modules/logs/__init__.py
166 @@ -1,7 +1,7 @@
167 # Copyright 2005-2013 Gentoo Foundation
168 # Distributed under the terms of the GNU General Public License v2
169
170 -doc = """Check and clean old logs in the PORT_LOGDIR."""
171 +doc = """Check and clean old logs in the PORTAGE_LOGDIR."""
172 __doc__ = doc
173
174
175 diff --git a/lib/portage/emaint/modules/logs/logs.py b/lib/portage/emaint/modules/logs/logs.py
176 index 97b45475d..a3fa2b5b8 100644
177 --- a/lib/portage/emaint/modules/logs/logs.py
178 +++ b/lib/portage/emaint/modules/logs/logs.py
179 @@ -6,17 +6,17 @@ from portage import os
180 from portage.util import shlex_split, varexpand
181
182 ## default clean command from make.globals
183 -## PORT_LOGDIR_CLEAN = 'find "${PORT_LOGDIR}" -type f ! -name "summary.log*" -mtime +7 -delete'
184 +## PORTAGE_LOGDIR_CLEAN = 'find "${PORTAGE_LOGDIR}" -type f ! -name "summary.log*" -mtime +7 -delete'
185
186 ERROR_MESSAGES = {
187 - 78 : "PORT_LOGDIR variable not set or PORT_LOGDIR not a directory.",
188 - 127 : "PORT_LOGDIR_CLEAN command not found."
189 + 78 : "PORTAGE_LOGDIR variable not set or PORTAGE_LOGDIR not a directory.",
190 + 127 : "PORTAGE_LOGDIR_CLEAN command not found."
191 }
192
193
194 class CleanLogs(object):
195
196 - short_desc = "Clean PORT_LOGDIR logs"
197 + short_desc = "Clean PORTAGE_LOGDIR logs"
198
199 @staticmethod
200 def name():
201 @@ -39,8 +39,8 @@ class CleanLogs(object):
202
203 @param **kwargs: optional dictionary of values used in this function are:
204 settings: portage settings instance: defaults to portage.settings
205 - "PORT_LOGDIR": directory to clean
206 - "PORT_LOGDIR_CLEAN": command for cleaning the logs.
207 + "PORTAGE_LOGDIR": directory to clean
208 + "PORTAGE_LOGDIR_CLEAN": command for cleaning the logs.
209 options: dict:
210 'NUM': int: number of days
211 'pretend': boolean
212 @@ -57,7 +57,7 @@ class CleanLogs(object):
213 num_of_days = options.get('NUM', None)
214 pretend = options.get('pretend', False)
215
216 - clean_cmd = settings.get("PORT_LOGDIR_CLEAN")
217 + clean_cmd = settings.get("PORTAGE_LOGDIR_CLEAN")
218 if clean_cmd:
219 clean_cmd = shlex_split(clean_cmd)
220 if '-mtime' in clean_cmd and num_of_days is not None:
221 @@ -83,11 +83,11 @@ class CleanLogs(object):
222
223 @staticmethod
224 def _clean_logs(clean_cmd, settings):
225 - logdir = settings.get("PORT_LOGDIR")
226 + logdir = settings.get("PORTAGE_LOGDIR")
227 if logdir is None or not os.path.isdir(logdir):
228 return 78
229
230 - variables = {"PORT_LOGDIR" : logdir}
231 + variables = {"PORTAGE_LOGDIR" : logdir}
232 cmd = [varexpand(x, mydict=variables) for x in clean_cmd]
233
234 try:
235 @@ -104,7 +104,7 @@ class CleanLogs(object):
236 if rval in ERROR_MESSAGES:
237 msg.append(ERROR_MESSAGES[rval])
238 else:
239 - msg.append("PORT_LOGDIR_CLEAN command returned %s" % rval)
240 + msg.append("PORTAGE_LOGDIR_CLEAN command returned %s" % rval)
241 msg.append("See the make.conf(5) man page for "
242 - "PORT_LOGDIR_CLEAN usage instructions.")
243 + "PORTAGE_LOGDIR_CLEAN usage instructions.")
244 return msg
245 diff --git a/lib/portage/package/ebuild/_config/special_env_vars.py b/lib/portage/package/ebuild/_config/special_env_vars.py
246 index a308518af..f4f2bec2c 100644
247 --- a/lib/portage/package/ebuild/_config/special_env_vars.py
248 +++ b/lib/portage/package/ebuild/_config/special_env_vars.py
249 @@ -176,7 +176,7 @@ environ_filter += [
250 "PORTAGE_RSYNC_EXTRA_OPTS", "PORTAGE_RSYNC_OPTS",
251 "PORTAGE_RSYNC_RETRIES", "PORTAGE_SSH_OPTS", "PORTAGE_SYNC_STALE",
252 "PORTAGE_USE",
253 - "PORT_LOGDIR", "PORT_LOGDIR_CLEAN",
254 + "PORTAGE_LOGDIR", "PORTAGE_LOGDIR_CLEAN",
255 "QUICKPKG_DEFAULT_OPTS", "REPOMAN_DEFAULT_OPTS",
256 "RESUMECOMMAND", "RESUMECOMMAND_FTP",
257 "RESUMECOMMAND_HTTP", "RESUMECOMMAND_HTTPS",
258 diff --git a/lib/portage/package/ebuild/prepare_build_dirs.py b/lib/portage/package/ebuild/prepare_build_dirs.py
259 index e53ccd0fb..c325819d1 100644
260 --- a/lib/portage/package/ebuild/prepare_build_dirs.py
261 +++ b/lib/portage/package/ebuild/prepare_build_dirs.py
262 @@ -278,36 +278,36 @@ def _prepare_workdir(mysettings):
263 except FileNotFound:
264 pass # ebuild.sh will create it
265
266 - if mysettings.get("PORT_LOGDIR", "") == "":
267 - while "PORT_LOGDIR" in mysettings:
268 - del mysettings["PORT_LOGDIR"]
269 - if "PORT_LOGDIR" in mysettings:
270 + if mysettings.get("PORTAGE_LOGDIR", "") == "":
271 + while "PORTAGE_LOGDIR" in mysettings:
272 + del mysettings["PORTAGE_LOGDIR"]
273 + if "PORTAGE_LOGDIR" in mysettings:
274 try:
275 - modified = ensure_dirs(mysettings["PORT_LOGDIR"])
276 + modified = ensure_dirs(mysettings["PORTAGE_LOGDIR"])
277 if modified:
278 # Only initialize group/mode if the directory doesn't
279 # exist, so that we don't override permissions if they
280 # were previously set by the administrator.
281 # NOTE: These permissions should be compatible with our
282 # default logrotate config as discussed in bug 374287.
283 - apply_secpass_permissions(mysettings["PORT_LOGDIR"],
284 + apply_secpass_permissions(mysettings["PORTAGE_LOGDIR"],
285 uid=portage_uid, gid=portage_gid, mode=0o2770)
286 except PortageException as e:
287 writemsg("!!! %s\n" % str(e), noiselevel=-1)
288 - writemsg(_("!!! Permission issues with PORT_LOGDIR='%s'\n") % \
289 - mysettings["PORT_LOGDIR"], noiselevel=-1)
290 + writemsg(_("!!! Permission issues with PORTAGE_LOGDIR='%s'\n") % \
291 + mysettings["PORTAGE_LOGDIR"], noiselevel=-1)
292 writemsg(_("!!! Disabling logging.\n"), noiselevel=-1)
293 - while "PORT_LOGDIR" in mysettings:
294 - del mysettings["PORT_LOGDIR"]
295 + while "PORTAGE_LOGDIR" in mysettings:
296 + del mysettings["PORTAGE_LOGDIR"]
297
298 compress_log_ext = ''
299 if 'compress-build-logs' in mysettings.features:
300 compress_log_ext = '.gz'
301
302 logdir_subdir_ok = False
303 - if "PORT_LOGDIR" in mysettings and \
304 - os.access(mysettings["PORT_LOGDIR"], os.W_OK):
305 - logdir = normalize_path(mysettings["PORT_LOGDIR"])
306 + if "PORTAGE_LOGDIR" in mysettings and \
307 + os.access(mysettings["PORTAGE_LOGDIR"], os.W_OK):
308 + logdir = normalize_path(mysettings["PORTAGE_LOGDIR"])
309 logid_path = os.path.join(mysettings["PORTAGE_BUILDDIR"], ".logid")
310 if not os.path.exists(logid_path):
311 open(_unicode_encode(logid_path), 'w').close()
312 diff --git a/lib/portage/tests/emerge/test_simple.py b/lib/portage/tests/emerge/test_simple.py
313 index b1402ddd5..866521488 100644
314 --- a/lib/portage/tests/emerge/test_simple.py
315 +++ b/lib/portage/tests/emerge/test_simple.py
316 @@ -420,7 +420,7 @@ call_has_and_best_version() {
317 "PORTAGE_PYTHON" : portage_python,
318 "PORTAGE_REPOSITORIES" : settings.repositories.config_string(),
319 "PORTAGE_TMPDIR" : portage_tmpdir,
320 - "PORT_LOGDIR" : portage_tmpdir,
321 + "PORTAGE_LOGDIR" : portage_tmpdir,
322 "PYTHONDONTWRITEBYTECODE" : os.environ.get("PYTHONDONTWRITEBYTECODE", ""),
323 "PYTHONPATH" : pythonpath,
324 "__PORTAGE_TEST_PATH_OVERRIDE" : fake_bin,
325 diff --git a/man/ebuild.5 b/man/ebuild.5
326 index d085d5a92..5ae84eb74 100644
327 --- a/man/ebuild.5
328 +++ b/man/ebuild.5
329 @@ -488,7 +488,7 @@ excluded during genertion of \fBPROVIDES\fR metadata (see
330 possible to create patterns containing quoted whitespace.
331 .TP
332 .B PORTAGE_LOG_FILE
333 -Contains the path of the build log. If \fBPORT_LOGDIR\fR variable is unset then
334 +Contains the path of the build log. If \fBPORTAGE_LOGDIR\fR variable is unset then
335 PORTAGE_LOG_FILE=\fI"${T}/build.log"\fR.
336 .TP
337 .B PORTAGE_SOCKS5_PROXY
338 diff --git a/man/emaint.1 b/man/emaint.1
339 index 4ded0058a..d244756e9 100644
340 --- a/man/emaint.1
341 +++ b/man/emaint.1
342 @@ -32,8 +32,8 @@ Discard merge lists saved for the \fBemerge\fR(1) \fB--resume\fR action.
343 OPTIONS: check, fix
344 .TP
345 .BR logs
346 -Clean out old logs from the \fBPORT_LOGDIR\fR using the command
347 -\fBPORT_LOGDIR_CLEAN\fR.
348 +Clean out old logs from the \fBPORTAGE_LOGDIR\fR using the command
349 +\fBPORTAGE_LOGDIR_CLEAN\fR.
350 See the \fBmake.conf\fR(5) man page for additional information as well as
351 enabling the \fB'clean-logs'\fR feature in emerge to do this automatically.
352 .br
353 @@ -73,7 +73,7 @@ Fix any problems that may exist.
354 .SH OPTIONS logs command only
355 .TP
356 .BR \-C ", " \-\-clean
357 -Cleans the logs from \fBPORT_LOGDIR\fR
358 +Cleans the logs from \fBPORTAGE_LOGDIR\fR
359 .TP
360 .BR \-p ", " \-\-pretend
361 Sets pretend mode (same as \-c, \-\-check) for use with the \-C, \-\-clean
362 diff --git a/man/emerge.1 b/man/emerge.1
363 index 8662f5514..6f53680b4 100644
364 --- a/man/emerge.1
365 +++ b/man/emerge.1
366 @@ -584,7 +584,7 @@ matches any of the given package atoms.
367 Clean up temporary files after a build failure. This is
368 particularly useful if you have \fBPORTAGE_TMPDIR\fR on
369 tmpfs. If this option is enabled, you probably also want
370 -to enable \fBPORT_LOGDIR\fR (see \fBmake.conf\fR(5)) in
371 +to enable \fBPORTAGE_LOGDIR\fR (see \fBmake.conf\fR(5)) in
372 order to save the build log.
373 .TP
374 .BR \-\-fetchonly ", " \-f
375 diff --git a/man/make.conf.5 b/man/make.conf.5
376 index de04e5e34..a0faf51bf 100644
377 --- a/man/make.conf.5
378 +++ b/man/make.conf.5
379 @@ -291,7 +291,7 @@ strips (or splits) them before installing.
380 .TP
381 .B binpkg\-logs
382 Keep logs from successful binary package merges. This is relevant only when
383 -\fBPORT_LOGDIR\fR is set.
384 +\fBPORTAGE_LOGDIR\fR is set.
385 .TP
386 .B binpkg\-multi\-instance
387 Enable support for multiple binary package instances per ebuild.
388 @@ -356,8 +356,8 @@ emerge to safely kill all subprocesses when ebuild phase exits.
389 .TP
390 .B clean\-logs
391 Enable automatic execution of the command specified by the
392 -PORT_LOGDIR_CLEAN variable. The default PORT_LOGDIR_CLEAN setting will
393 -remove all files from PORT_LOGDIR that were last modified at least 7
394 +PORTAGE_LOGDIR_CLEAN variable. The default PORTAGE_LOGDIR_CLEAN setting will
395 +remove all files from PORTAGE_LOGDIR that were last modified at least 7
396 days ago.
397 .TP
398 .B collision\-protect
399 @@ -422,7 +422,7 @@ concurrently. Also see \fIparallel\-install\fR.
400 .B fail\-clean
401 Clean up temporary files after a build failure. This is particularly useful
402 if you have \fBPORTAGE_TMPDIR\fR on tmpfs. If this feature is enabled, you
403 -probably also want to enable \fBPORT_LOGDIR\fR in order to save the build log.
404 +probably also want to enable \fBPORTAGE_LOGDIR\fR in order to save the build log.
405 Both the \fBebuild\fR(1) command and the \fInoclean\fR feature cause the
406 \fIfail\-clean\fR feature to be automatically disabled.
407 .TP
408 @@ -632,12 +632,12 @@ incompatibility.
409 .TP
410 .B split\-elog
411 Store logs created by \fBPORTAGE_ELOG_SYSTEM="save"\fR in category
412 -subdirectories of \fBPORT_LOGDIR/elog\fR, instead of using
413 -\fBPORT_LOGDIR/elog\fR directly.
414 +subdirectories of \fBPORTAGE_LOGDIR/elog\fR, instead of using
415 +\fBPORTAGE_LOGDIR/elog\fR directly.
416 .TP
417 .B split\-log
418 -Store build logs in category subdirectories of \fBPORT_LOGDIR/build\fR,
419 -instead of using \fBPORT_LOGDIR\fR directly.
420 +Store build logs in category subdirectories of \fBPORTAGE_LOGDIR/build\fR,
421 +instead of using \fBPORTAGE_LOGDIR\fR directly.
422 .TP
423 .B splitdebug
424 Prior to stripping ELF etdyn and etexec files, the debugging info is
425 @@ -691,7 +691,7 @@ Also see the related \fIdowngrade\-backup\fR feature.
426 .TP
427 .B unmerge\-logs
428 Keep logs from successful unmerge phases. This is relevant only when
429 -\fBPORT_LOGDIR\fR is set.
430 +\fBPORTAGE_LOGDIR\fR is set.
431 .TP
432 .B unmerge\-orphans
433 If a file is not claimed by another package in the same slot and it is not
434 --
435 2.13.6

Attachments

File name MIME type
signature.asc application/pgp-signature