Rebuild when build-time/run-time deps are upgraded.

Rebuild when build-time/run-time deps are upgraded.

If pkgA has been updated, and pkgB depends on pkgA at both
build-time and run-time, pkgB needs to be rebuilt. This
feature ensures that all packages are consistent when
dependencies that are used at both runtime and build time
are changed.

This feature only rebuilds packages one layer deep. That
means that if you upgrade libcros, for example, packages
that depend directly on libcros will be rebuilt and
reinstalled, but indirect dependencies will not be rebuilt.
 
BUG=chromium-os:14296
TEST=Test whether packages rebuilding a bunch of packages.

Change-Id: Idbc0532b4b1de28fd9e5a0abe3b7dbe1a3abd2c8

[zmedico, 2011-04-30 19:18:35]

Inside _trigger_rebuild, shouldn't the bintree code be conditional on  the
--usepkg option?

Here is a patch will fix a failure in the depclean unit tests (use runtests.sh
to run all tests):

diff --git a/pym/_emerge/UnmergeDepPriority.py
b/pym/_emerge/UnmergeDepPriority.py
index 0f67f3b..db4836e 100644
--- a/pym/_emerge/UnmergeDepPriority.py
+++ b/pym/_emerge/UnmergeDepPriority.py
@@ -3,7 +3,7 @@
 
 from _emerge.AbstractDepPriority import AbstractDepPriority
 class UnmergeDepPriority(AbstractDepPriority):
-	__slots__ = ("optional", "satisfied",)
+	__slots__ = ("ignored", "optional", "satisfied",)
 	"""
 	Combination of properties           Priority  Category
 
@@ -32,6 +32,8 @@ class UnmergeDepPriority(AbstractDepPriority):
 		return -2
 
 	def __str__(self):
+		if self.ignored:
+			return "ignored"
 		myvalue = self.__int__()
 		if myvalue > self.SOFT:
 			return "hard"

[zmedico, 2011-04-30 19:29:56]

This patch adds tests for emerge --rebuild. Why is it that sys-apps/c-2 is
pulled in by --rebuild even though it has only DEPEND and no RDEPEND?

diff --git a/pym/_emerge/create_depgraph_params.py
b/pym/_emerge/create_depgraph_params.py
index d60259e..0986347 100644
--- a/pym/_emerge/create_depgraph_params.py
+++ b/pym/_emerge/create_depgraph_params.py
@@ -33,7 +33,7 @@ def create_depgraph_params(myopts, myaction):
        deep = myopts.get("--deep")
        if deep is not None and deep != 0:
                myparams["deep"] = deep
-       if "--complete-graph" in myopts:
+       if "--complete-graph" in myopts or "--rebuild" in myopts:
                myparams["complete"] = True
        if "--emptytree" in myopts:
                myparams["empty"] = True
diff --git a/pym/portage/tests/resolver/test_rebuild.py
b/pym/portage/tests/resolver/test_rebuild.py
new file mode 100644
index 0000000..eefb967
--- /dev/null
+++ b/pym/portage/tests/resolver/test_rebuild.py
@@ -0,0 +1,61 @@
+from portage.tests import TestCase
+from portage.tests.resolver.ResolverPlayground import (ResolverPlayground,
+	ResolverPlaygroundTestCase)
+
+class RebuildTestCase(TestCase):
+
+	def testRebuild(self):
+		"""
+		Rebuild packages when dependencies that are used at both build-time and
+		run-time are upgraded.
+		"""
+
+		ebuilds = {
+			"sys-libs/x-1": { },
+			"sys-libs/x-2": { },
+			"sys-apps/a-1": { "DEPEND"  : "sys-libs/x", "RDEPEND" : "sys-libs/x"},
+			"sys-apps/a-2": { "DEPEND"  : "sys-libs/x", "RDEPEND" : "sys-libs/x"},
+			"sys-apps/b-1": { "DEPEND"  : "sys-libs/x", "RDEPEND" : "sys-libs/x"},
+			"sys-apps/b-2": { "DEPEND"  : "sys-libs/x", "RDEPEND" : "sys-libs/x"},
+			"sys-apps/c-1": { "DEPEND"  : "sys-libs/x",},
+			"sys-apps/c-2": { "DEPEND"  : "sys-libs/x",},
+			"sys-apps/d-1": { "RDEPEND" : "sys-libs/x"},
+			"sys-apps/d-2": { "RDEPEND" : "sys-libs/x"},
+			}
+
+		installed = {
+			"sys-libs/x-1": { },
+			"sys-apps/a-1": { "DEPEND"  : "sys-libs/x", "RDEPEND" : "sys-libs/x"},
+			"sys-apps/b-1": { "DEPEND"  : "sys-libs/x", "RDEPEND" : "sys-libs/x"},
+			"sys-apps/c-1": { "DEPEND"  : "sys-libs/x",},
+			"sys-apps/d-1": { "RDEPEND" : "sys-libs/x"},
+			}
+
+		world = ["sys-apps/a", "sys-apps/b", "sys-apps/c", "sys-apps/d"]
+
+		test_cases = (
+				ResolverPlaygroundTestCase(
+					["sys-libs/x"],
+					options = {"--rebuild" : True,
+						"--norebuild-atoms" : ["sys-apps/b"]},
+					mergelist = ['sys-libs/x-2', 'sys-apps/a-2', 'sys-apps/c-2'],
+					ignore_mergelist_order = True,
+					success = True),
+
+				ResolverPlaygroundTestCase(
+					["sys-libs/x"],
+					options = {"--rebuild" : True},
+					mergelist = ['sys-libs/x-2', 'sys-apps/a-2', 'sys-apps/b-2',
'sys-apps/c-2'],
+					ignore_mergelist_order = True,
+					success = True),
+			)
+
+		playground = ResolverPlayground(ebuilds=ebuilds,
+			installed=installed, world=world)
+
+		try:
+			for test_case in test_cases:
+				playground.run_TestCase(test_case)
+				self.assertEqual(test_case.test_success, True, test_case.fail_msg)
+		finally:
+			playground.cleanup()

[davidjames, 2011-05-01 16:27:22]

On 2011/04/30 19:18:35, zmedico wrote:
> Inside _trigger_rebuild, shouldn't the bintree code be conditional on  the
> --usepkg option?

Done.

> 
> Here is a patch will fix a failure in the depclean unit tests (use runtests.sh
> to run all tests):

Aha, thanks. Applied.

On 2011/04/30 19:29:56, zmedico wrote:
> This patch adds tests for emerge --rebuild. Why is it that sys-apps/c-2 is
> pulled in by --rebuild even though it has only DEPEND and no RDEPEND?

Thanks for the test. Looks like your test is using EAPI=0, so RDEPEND defaults
to DEPEND. I've added your test into the CL and updated it to set RDEPEND=""
explicitly. I also added a few more packages to the test case to test more
scenarios.

[zmedico, 2011-05-01 17:23:57]

This is merged upstream:

http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=470871ee...

[zmedico, 2011-05-01 20:50:49]

Here's a little bug fix:

http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b26576b2...

[zmedico, 2011-05-01 21:21:36]

Another fix:

http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a524f21f...

[zmedico, 2011-05-01 23:30:15]

A fix for circular dependencies:

http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=dd794a5e...

[zmedico, 2011-05-02 03:11:27]

Here's another fix for cases in which --with-bdeps isn't enabled:

http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=60564a32...