Attachment #579332 for bug #687734

View | Details | Raw Unified | Return to bug 687734
Collapse All | Expand All

Lines 29-35 ACCEPT_RESTRICT="*" Link Here

(-)a/cnf/make.globals (-1 / +1 lines)
29	# Miscellaneous paths	29	# Miscellaneous paths
30	DISTDIR="/var/cache/distfiles"	30	DISTDIR="/var/cache/distfiles"
31	PKGDIR="/var/cache/binpkgs"	31	PKGDIR="/var/cache/binpkgs"
32	RPMDIR="/usr/portage/rpm"	32	RPMDIR="/var/cache/rpm"
33		33
34	# Temporary build directory	34	# Temporary build directory
35	PORTAGE_TMPDIR="/var/tmp"	35	PORTAGE_TMPDIR="/var/tmp"





COMPAT_DISTDIR = 'usr/portage/distfiles'
COMPAT_PKGDIR = 'usr/portage/packages'
COMPAT_RPMDIR = 'usr/portage/rpm'
COMPAT_MAIN_REPO = 'usr/portage'



	except OSError:
		do_pkgdir = False

	compat_rpmdir = os.path.join(portage.const.EPREFIX or '/', COMPAT_RPMDIR)
	try:
		do_rpmdir = os.path.samefile(config['RPMDIR'], compat_rpmdir)
	except OSError:
		do_rpmdir = False

	compat_main_repo = os.path.join(portage.const.EPREFIX or '/', COMPAT_MAIN_REPO)
	try:
		do_main_repo = os.path.samefile(config.repositories.mainRepoLocation(), compat_main_repo)
	except OSError:
		do_main_repo = False

	if do_distdir or do_pkgdir or do_rpmdir:
		config_path = os.path.join(os.environ['ED'], GLOBAL_CONFIG_PATH.lstrip(os.sep), 'make.globals')
		with open(config_path) as f:
			content = f.read()

				compat_setting = 'PKGDIR="{}"'.format(compat_pkgdir)
				out.einfo('Setting make.globals default {} for backward compatibility'.format(compat_setting))
				content = re.sub('^PKGDIR=.*$', compat_setting, content, flags=re.MULTILINE)
			if do_rpmdir:
				compat_setting = 'RPMDIR="{}"'.format(compat_rpmdir)
				out.einfo('Setting make.globals default {} for backward compatibility'.format(compat_setting))
				content = re.sub('^RPMDIR=.*$', compat_setting, content, flags=re.MULTILINE)
		with open(config_path, 'wt') as f:
			f.write(content)


Lines 1-4 Link Here

(-)a/man/make.conf.5 (-3 / +2 lines)
1	.TH "MAKE.CONF" "5" "Apr 2019" "Portage VERSION" "Portage"	1	.TH "MAKE.CONF" "5" "Jun 2019" "Portage VERSION" "Portage"
2	.SH "NAME"	2	.SH "NAME"
3	make.conf \- custom settings for Portage	3	make.conf \- custom settings for Portage
4	.SH "SYNOPSIS"	4	.SH "SYNOPSIS"
Lines 1125-1131 Defaults to /. Link Here
1125	\fBRPMDIR\fR = \fI[path]\fR	1125	\fBRPMDIR\fR = \fI[path]\fR
1126	Defines the location where created RPM packages will be stored.	1126	Defines the location where created RPM packages will be stored.
1127	.br	1127	.br
1128	Defaults to /usr/portage/rpm.	1128	Defaults to /var/cache/rpm.
1129	.TP	1129	.TP
1130	\fBSYNC\fR = \fI[RSYNC]\fR	1130	\fBSYNC\fR = \fI[RSYNC]\fR
1131	Insert your preferred rsync mirror here. This rsync server	1131	Insert your preferred rsync mirror here. This rsync server
1132	-

Return to bug 687734

Lines 9-14 from portage.const import GLOBAL_CONFIG_PATH Link Here

(-)a/lib/portage/_compat_upgrade/default_locations.py (-1 / +12 lines)
9		9
10	COMPAT_DISTDIR = 'usr/portage/distfiles'	10	COMPAT_DISTDIR = 'usr/portage/distfiles'
11	COMPAT_PKGDIR = 'usr/portage/packages'	11	COMPAT_PKGDIR = 'usr/portage/packages'
		12	COMPAT_RPMDIR = 'usr/portage/rpm'
12	COMPAT_MAIN_REPO = 'usr/portage'	13	COMPAT_MAIN_REPO = 'usr/portage'
13		14
14		15
Lines 46-58 def main(): Link Here
46	except OSError:	47	except OSError:
47	do_pkgdir = False	48	do_pkgdir = False
48		49
		50	compat_rpmdir = os.path.join(portage.const.EPREFIX or '/', COMPAT_RPMDIR)
		51	try:
		52	do_rpmdir = os.path.samefile(config['RPMDIR'], compat_rpmdir)
		53	except OSError:
		54	do_rpmdir = False
		55
49	compat_main_repo = os.path.join(portage.const.EPREFIX or '/', COMPAT_MAIN_REPO)	56	compat_main_repo = os.path.join(portage.const.EPREFIX or '/', COMPAT_MAIN_REPO)
50	try:	57	try:
51	do_main_repo = os.path.samefile(config.repositories.mainRepoLocation(), compat_main_repo)	58	do_main_repo = os.path.samefile(config.repositories.mainRepoLocation(), compat_main_repo)
52	except OSError:	59	except OSError:
53	do_main_repo = False	60	do_main_repo = False
54		61
55	if do_distdir or do_pkgdir:	62	if do_distdir or do_pkgdir or do_rpmdir:
56	config_path = os.path.join(os.environ['ED'], GLOBAL_CONFIG_PATH.lstrip(os.sep), 'make.globals')	63	config_path = os.path.join(os.environ['ED'], GLOBAL_CONFIG_PATH.lstrip(os.sep), 'make.globals')
57	with open(config_path) as f:	64	with open(config_path) as f:
58	content = f.read()	65	content = f.read()
Lines 64-69 def main(): Link Here
64	compat_setting = 'PKGDIR="{}"'.format(compat_pkgdir)	71	compat_setting = 'PKGDIR="{}"'.format(compat_pkgdir)
65	out.einfo('Setting make.globals default {} for backward compatibility'.format(compat_setting))	72	out.einfo('Setting make.globals default {} for backward compatibility'.format(compat_setting))
66	content = re.sub('^PKGDIR=.*$', compat_setting, content, flags=re.MULTILINE)	73	content = re.sub('^PKGDIR=.*$', compat_setting, content, flags=re.MULTILINE)
		74	if do_rpmdir:
		75	compat_setting = 'RPMDIR="{}"'.format(compat_rpmdir)
		76	out.einfo('Setting make.globals default {} for backward compatibility'.format(compat_setting))
		77	content = re.sub('^RPMDIR=.*$', compat_setting, content, flags=re.MULTILINE)
67	with open(config_path, 'wt') as f:	78	with open(config_path, 'wt') as f:
68	f.write(content)	79	f.write(content)
69		80