Attachment #103883 for bug #157932

Lines 1180-1186 Link Here

(-)portage-2.1.2_rc3-orig/bin/ebuild.sh (-1 / +1 lines)
1180	[[ ${EBUILD_PHASE} != *rm ]]; then	1180	[[ ${EBUILD_PHASE} != *rm ]]; then
1181	# This is disabled in the *rm phases because they frequently give	1181	# This is disabled in the *rm phases because they frequently give
1182	# false alarms due to INHERITED in /var/db/pkg being outdated	1182	# false alarms due to INHERITED in /var/db/pkg being outdated
1183	# in comparison the the eclasses from the portage tree.	1183	# in comparison the eclasses from the portage tree.
1184	if ! hasq $ECLASS $INHERITED; then	1184	if ! hasq $ECLASS $INHERITED; then
1185	vecho	1185	vecho
1186	vecho "QA Notice: ECLASS '$ECLASS' inherited illegally in $CATEGORY/$PF" >&2	1186	vecho "QA Notice: ECLASS '$ECLASS' inherited illegally in $CATEGORY/$PF" >&2

Lines 173-179 Link Here

(-)portage-2.1.2_rc3-orig/bin/portageq (-1 / +1 lines)
173		173
174	def match(argv):	174	def match(argv):
175	"""<root> <category/package>	175	"""<root> <category/package>
176	Returns \n seperated list of category/package-version	176	Returns \n separated list of category/package-version
177	"""	177	"""
178	if (len(argv) < 2):	178	if (len(argv) < 2):
179	print "ERROR: insufficient parameters!"	179	print "ERROR: insufficient parameters!"




		for y in fails[x]:
			print "   "+y

def grouplist(mylist,separator="/"):
	"""(list,separator="/") -- Takes a list of elements; groups them into
	same initial element categories. Returns a dict of {base:[sublist]}
	From: ["blah/foo","spork/spatula","blah/weee/splat"]
	To:   {"blah":["foo","weee/splat"], "spork":["spatula"]}"""
	mygroups={}
	for x in mylist:
		xs=string.split(x,separator)
		if xs[0]==".":
			xs=xs[1:]
		if xs[0] not in mygroups.keys():
			mygroups[xs[0]]=[string.join(xs[1:],separator)]
		else:
			mygroups[xs[0]]+=[string.join(xs[1:],separator)]
	return mygroups

if mymode!="commit":

Lines 1856-1862 Link Here

(-)portage-2.1.2_rc3-orig/ChangeLog (-1 / +1 lines)
1856	#139449.	1856	#139449.
1857	4086 zmedico Move code that updates depgraph state from select_dep() to a	1857	4086 zmedico Move code that updates depgraph state from select_dep() to a
1858	more appropriate location in create(). This fixes a bug in	1858	more appropriate location in create(). This fixes a bug in
1859	$ROOT handling, where the the $ROOT of the child is used	1859	$ROOT handling, where the $ROOT of the child is used
1860	where the $ROOT of the parent should have been (similar to	1860	where the $ROOT of the parent should have been (similar to
1861	bug #108449).	1861	bug #108449).
1862	4087 zmedico Link the full handbook since it's guaranteed to continue to	1862	4087 zmedico Link the full handbook since it's guaranteed to continue to

Lines 8-14 Link Here

(-)portage-2.1.2_rc3-orig/cnf/make.conf.sparc.diff (-1 / +1 lines)
8	+# ============	8	+# ============
9	+# This should be left to the default value of sparc-unknown-linux-gnu unless	9	+# This should be left to the default value of sparc-unknown-linux-gnu unless
10	+# you are absolutely certain of the consequences. In addition to potentially	10	+# you are absolutely certain of the consequences. In addition to potentially
11	+# destroying your system, you will recieve no support and your bugs will be	11	+# destroying your system, you will receive no support and your bugs will be
12	+# marked INVALID if you change this.	12	+# marked INVALID if you change this.
13	+#	13	+#
14	+# CHOST="sparc-unknown-linux-gnu"	14	+# CHOST="sparc-unknown-linux-gnu"

Lines 319-325 Link Here

(-)portage-2.1.2_rc3-orig/make.conf.txt (-1 / +1 lines)
319	:default: http://distfiles.gentoo.org http://distro.ibiblio.org/pub/linux/distributions/gentoo	319	:default: http://distfiles.gentoo.org http://distro.ibiblio.org/pub/linux/distributions/gentoo
320	:valdesc: space separated list of mirror locations	320	:valdesc: space separated list of mirror locations
321		321
322	Insert your space-seperated list of local mirrors here. These locations are	322	Insert your space-separated list of local mirrors here. These locations are
323	used to download files before the ones listed in the ebuild scripts. Merging	323	used to download files before the ones listed in the ebuild scripts. Merging
324	'app-portage/mirrorselect' can help to select an appropriate mirror.	324	'app-portage/mirrorselect' can help to select an appropriate mirror.
325		325

Lines 193-199 Link Here

(-)portage-2.1.2_rc3-orig/man/make.conf.5 (-2 / +2 lines)
193	When utilizing \fBebuild\fR(1), only run the function requested.	193	When utilizing \fBebuild\fR(1), only run the function requested.
194	.TP	194	.TP
195	.B noclean	195	.B noclean
196	Do not delete the the source and temporary files after the merge process.	196	Do not delete the source and temporary files after the merge process.
197	.TP	197	.TP
198	.B nodoc	198	.B nodoc
199	Do not install doc files (/usr/share/doc).	199	Do not install doc files (/usr/share/doc).
Lines 272-278 Link Here
272	place-holders \\${DISTDIR} and \\${URI}.	272	place-holders \\${DISTDIR} and \\${URI}.
273	.TP	273	.TP
274	\fBGENTOO_MIRRORS\fR = \fI[URLs]\fR	274	\fBGENTOO_MIRRORS\fR = \fI[URLs]\fR
275	Insert your space\-seperated list of local mirrors here. These	275	Insert your space\-separated list of local mirrors here. These
276	locations are used to download files before the ones listed in	276	locations are used to download files before the ones listed in
277	the \fIebuild scripts\fR. Merging 'mirrorselect' can help.	277	the \fIebuild scripts\fR. Merging 'mirrorselect' can help.
278	.TP	278	.TP

Lines 166-173 Link Here

(-)portage-2.1.2_rc3-orig/pym/cache/template.py (-2 / +1 lines)
166	"""takes a dict, returns a string representing said dict"""	166	"""takes a dict, returns a string representing said dict"""
167	"""The "new format", which causes older versions of <portage-2.1.2 to	167	"""The "new format", which causes older versions of <portage-2.1.2 to
168	traceback with a ValueError due to failed long() conversion. This format	168	traceback with a ValueError due to failed long() conversion. This format
169	isn't currently written, but the the capability to read it is already built	169	isn't currently written, but the capability to read it is already built in.
170	in.
171	return "\t".join(["%s\t%s" % (k, str(v)) \	170	return "\t".join(["%s\t%s" % (k, str(v)) \
172	for k, v in eclass_dict.iteritems()])	171	for k, v in eclass_dict.iteritems()])
173	"""	172	"""

Lines 170-176 Link Here

(-)portage-2.1.2_rc3-orig/pym/cvstree.py (-1 / +1 lines)
170	def getentries(mydir,recursive=0):	170	def getentries(mydir,recursive=0):
171	"""(basedir,recursive=0)	171	"""(basedir,recursive=0)
172	Scans the given directory and returns an datadict of all the entries in	172	Scans the given directory and returns an datadict of all the entries in
173	the directory seperated as a dirs dict and a files dict."""	173	the directory separated as a dirs dict and a files dict."""
174	myfn=mydir+"/CVS/Entries"	174	myfn=mydir+"/CVS/Entries"
175	# entries=[dirs, files]	175	# entries=[dirs, files]
176	entries={"dirs":{},"files":{}}	176	entries={"dirs":{},"files":{}}

Return to bug 157932

Lines 1414-1433 Link Here

(-)portage-2.1.2_rc3-orig/bin/repoman (-5 / +5 lines)
1414	for y in fails[x]:	1414	for y in fails[x]:
1415	print " "+y	1415	print " "+y
1416		1416
1417	def grouplist(mylist,seperator="/"):	1417	def grouplist(mylist,separator="/"):
1418	"""(list,seperator="/") -- Takes a list of elements; groups them into	1418	"""(list,separator="/") -- Takes a list of elements; groups them into
1419	same initial element categories. Returns a dict of {base:[sublist]}	1419	same initial element categories. Returns a dict of {base:[sublist]}
1420	From: ["blah/foo","spork/spatula","blah/weee/splat"]	1420	From: ["blah/foo","spork/spatula","blah/weee/splat"]
1421	To: {"blah":["foo","weee/splat"], "spork":["spatula"]}"""	1421	To: {"blah":["foo","weee/splat"], "spork":["spatula"]}"""
1422	mygroups={}	1422	mygroups={}
1423	for x in mylist:	1423	for x in mylist:
1424	xs=string.split(x,seperator)	1424	xs=string.split(x,separator)
1425	if xs[0]==".":	1425	if xs[0]==".":
1426	xs=xs[1:]	1426	xs=xs[1:]
1427	if xs[0] not in mygroups.keys():	1427	if xs[0] not in mygroups.keys():
1428	mygroups[xs[0]]=[string.join(xs[1:],seperator)]	1428	mygroups[xs[0]]=[string.join(xs[1:],separator)]
1429	else:	1429	else:
1430	mygroups[xs[0]]+=[string.join(xs[1:],seperator)]	1430	mygroups[xs[0]]+=[string.join(xs[1:],separator)]
1431	return mygroups	1431	return mygroups
1432		1432
1433	if mymode!="commit":	1433	if mymode!="commit":