Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 69763 | Differences between
and this patch

Collapse All | Expand All

(-)portage.py.orig (-2 / +9 lines)
Lines 1523-1528 Link Here
1523
	
1523
	
1524
	if listonly or ("distlocks" not in features):
1524
	if listonly or ("distlocks" not in features):
1525
		use_locks = 0
1525
		use_locks = 0
1526
		
1527
	if ("skiprocheck" in features) and use_locks:
1528
		print "!!! disabling locking for fetching to readonly filesystem"
1529
		print "!!! you can get rid of this warning by adding -distlocks to FEATURES"
1530
		use_locks = 0
1531
		
1526
1532
1527
	# local mirrors are always added
1533
	# local mirrors are always added
1528
	if custommirrors.has_key("local"):
1534
	if custommirrors.has_key("local"):
Lines 1644-1651 Link Here
1644
	del missingSourceHost
1650
	del missingSourceHost
1645
1651
1646
	can_fetch=True
1652
	can_fetch=True
1647
	if not os.access(mysettings["DISTDIR"]+"/",os.W_OK):
1653
	if ("skiprocheck" not in features) and (not os.access(mysettings["DISTDIR"]+"/",os.W_OK)):
1648
		print "!!! No write access to %s" % mysettings["DISTDIR"]+"/"
1654
		print "!!! No write access to %s" % mysettings["DISTDIR"]+"/"
1655
		print "!!! You can disable this check by adding skiprocheck to FEATURES"
1649
		can_fetch=False
1656
		can_fetch=False
1650
	else:
1657
	else:
1651
		mystat=os.stat(mysettings["DISTDIR"]+"/")
1658
		mystat=os.stat(mysettings["DISTDIR"]+"/")
Lines 1785-1791 Link Here
1785
						myret=spawn(myfetch,mysettings,free=1)
1792
						myret=spawn(myfetch,mysettings,free=1)
1786
				finally:
1793
				finally:
1787
					#if root, -always- set the perms.
1794
					#if root, -always- set the perms.
1788
					if os.path.exists(mysettings["DISTDIR"]+"/"+myfile) and (fetched != 1 or os.getuid() == 0):
1795
					if os.path.exists(mysettings["DISTDIR"]+"/"+myfile) and (fetched != 1 or os.getuid() == 0) and os.access(mysettings["DISTDIR"]+"/"+locks_in_subdir,os.W_OK):
1789
						if os.stat(mysettings["DISTDIR"]+"/"+myfile).st_gid != portage_gid:
1796
						if os.stat(mysettings["DISTDIR"]+"/"+myfile).st_gid != portage_gid:
1790
							try:
1797
							try:
1791
								os.chown(mysettings["DISTDIR"]+"/"+myfile,-1,portage_gid)
1798
								os.chown(mysettings["DISTDIR"]+"/"+myfile,-1,portage_gid)

Return to bug 69763