[gentoo-commits] portage r15175 - in main/branches/prefix: bin bin/ebuild-helpers man pym/portage/dbapi

[Fabian Groffen (grobian)]

Author: grobian
Date: 2010-01-08 07:48:41 +0000 (Fri, 08 Jan 2010)
New Revision: 15175

Modified:
   main/branches/prefix/bin/ebuild-helpers/doins
   main/branches/prefix/bin/repoman
   main/branches/prefix/man/repoman.1
   main/branches/prefix/pym/portage/dbapi/vartree.py
Log:
   Merged from trunk -r15169:15174

   | 15172   | Fix it so an empty directory given to doins -r does not      |
   | zmedico | trigger failure.                                             |
   
   | 15173   | Add a TODO comment for improved handling of /lib/modules.    |
   | zmedico |                                                              |
   
   | 15174   | Bug #269225 - Warn about virtuals with non-empty HOMEPAGE or |
   | zmedico | LICENSE. Thanks to Ulrich M?\195?\188ller <ulm@g.o> for this patch.  |


Modified: main/branches/prefix/bin/ebuild-helpers/doins
===================================================================
--- main/branches/prefix/bin/ebuild-helpers/doins	2010-01-07 20:19:54 UTC (rev 15174)
+++ main/branches/prefix/bin/ebuild-helpers/doins	2010-01-08 07:48:41 UTC (rev 15175)
@@ -71,16 +71,12 @@
 }
 
 _xdoins() {
-	local -i success=0 failed=0
+	local -i failed=0
 	while read -d $'\0' x ; do
 		_doins "$x" "${x%/*}"
-		if [[ $? -eq 0 ]] ; then
-			((success|=1))
-		else
-			((failed|=1))
-		fi
+		((failed|=$?))
 	done
-	[[ $failed -ne 0 || $success -eq 0 ]] && return 1 || return 0
+	return $failed
 }
 
 success=0
@@ -117,6 +113,9 @@
 		find "$x_orig" -type d -exec dodir "${INSDESTTREE}/{}" \;
 		find "$x_orig" \( -type f -or -type l \) -print0 | _xdoins
 		if [[ ${PIPESTATUS[1]} -eq 0 ]] ; then
+			# NOTE: Even if only an empty directory is installed here, it
+			# still counts as success, since an empty directory given as
+			# an argument to doins -r should not trigger failure.
 			((success|=1))
 		else
 			((failed|=1))

Modified: main/branches/prefix/bin/repoman
===================================================================
--- main/branches/prefix/bin/repoman	2010-01-07 20:19:54 UTC (rev 15174)
+++ main/branches/prefix/bin/repoman	2010-01-08 07:48:41 UTC (rev 15175)
@@ -276,6 +276,7 @@
 	"KEYWORDS.stable":"Ebuilds that have been added directly with stable KEYWORDS",
 	"KEYWORDS.stupid":"Ebuilds that use KEYWORDS=-* instead of package.mask", 
 	"LICENSE.missing":"Ebuilds that have a missing or empty LICENSE variable",
+	"LICENSE.virtual":"Virtuals that have a non-empty LICENSE variable",
 	"DESCRIPTION.missing":"Ebuilds that have a missing or empty DESCRIPTION variable",
 	"DESCRIPTION.toolong":"DESCRIPTION is over %d characters" % max_desc_len,
 	"EAPI.definition":"EAPI is defined after an inherit call (must be defined before)",
@@ -283,6 +284,7 @@
 	"EAPI.unsupported":"Ebuilds that have an unsupported EAPI version (you must upgrade portage)",
 	"SLOT.invalid":"Ebuilds that have a missing or invalid SLOT variable value",
 	"HOMEPAGE.missing":"Ebuilds that have a missing or empty HOMEPAGE variable",
+	"HOMEPAGE.virtual":"Virtuals that have a non-empty HOMEPAGE variable",
 	"DEPEND.bad":"User-visible ebuilds with bad DEPEND settings (matched against *visible* ebuilds)",
 	"RDEPEND.bad":"User-visible ebuilds with bad RDEPEND settings (matched against *visible* ebuilds)",
 	"PDEPEND.bad":"User-visible ebuilds with bad PDEPEND settings (matched against *visible* ebuilds)",
@@ -359,6 +361,8 @@
 "DEPEND.badmaskedindev","RDEPEND.badmaskedindev","PDEPEND.badmaskedindev",
 "DEPEND.badtilde", "RDEPEND.badtilde", "PDEPEND.badtilde",
 "DESCRIPTION.toolong",
+"HOMEPAGE.virtual",
+"LICENSE.virtual",
 "KEYWORDS.dropped",
 "KEYWORDS.stupid",
 "KEYWORDS.missing",
@@ -1381,6 +1385,13 @@
 				stats[myqakey]=stats[myqakey]+1
 				fails[myqakey].append(x+"/"+y+".ebuild")
 
+		if catdir == "virtual":
+			for var in ("HOMEPAGE", "LICENSE"):
+				if myaux.get(var):
+					myqakey = var + ".virtual"
+					stats[myqakey] = stats[myqakey] + 1
+					fails[myqakey].append(relative_path)
+
 		# 14 is the length of DESCRIPTION=""
 		if len(myaux['DESCRIPTION']) > max_desc_len:
 			stats['DESCRIPTION.toolong'] += 1

Modified: main/branches/prefix/man/repoman.1
===================================================================
--- main/branches/prefix/man/repoman.1	2010-01-07 20:19:54 UTC (rev 15174)
+++ main/branches/prefix/man/repoman.1	2010-01-08 07:48:41 UTC (rev 15175)
@@ -119,6 +119,9 @@
 .B HOMEPAGE.missing
 Ebuilds that have a missing or empty HOMEPAGE variable
 .TP
+.B HOMEPAGE.virtual
+Virtuals that have a non-empty HOMEPAGE variable
+.TP
 .B IUSE.invalid
 This ebuild has a variable in IUSE that is not in the use.desc or its metadata.xml file
 .TP
@@ -149,6 +152,9 @@
 .B LICENSE.syntax
 Syntax error in LICENSE (usually an extra/missing space/parenthesis)
 .TP
+.B LICENSE.virtual
+Virtuals that have a non-empty LICENSE variable
+.TP
 .B LIVEVCS.stable
 Ebuild is a live ebuild (cvs, git, darcs, svn, etc) checkout with stable keywords.
 .TP

Modified: main/branches/prefix/pym/portage/dbapi/vartree.py
===================================================================
--- main/branches/prefix/pym/portage/dbapi/vartree.py	2010-01-07 20:19:54 UTC (rev 15174)
+++ main/branches/prefix/pym/portage/dbapi/vartree.py	2010-01-08 07:48:41 UTC (rev 15175)
@@ -3524,6 +3524,10 @@
 				# upgraded. We effectively only want one half of the config protection
 				# functionality for /lib/modules. For portage-ng both capabilities
 				# should be able to be independently specified.
+				# TODO: For rebuilds, re-parent previous modules to the new
+				# installed instance (so they are not orphans). For normal
+				# uninstall (not rebuild/reinstall), remove the modules along
+				# with all other files (leave no orphans).
 				if obj.startswith(modprotect):
 					show_unmerge("---", unmerge_desc["cfgpro"], file_type, obj)
 					continue