summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-12-19 00:10:21 +0000
committerZac Medico <zmedico@gentoo.org>2006-12-19 00:10:21 +0000
commit1da85da5f7033e9adbdbac2d72355b7b86beb7a6 (patch)
tree35b7bf7cb126b475fbf49eaa88434d4e4d05929f
parent9030636fb3a967865d422c165b5aec014b090ed3 (diff)
downloadportage-1da85da5f7033e9adbdbac2d72355b7b86beb7a6.tar.gz
portage-1da85da5f7033e9adbdbac2d72355b7b86beb7a6.tar.bz2
portage-1da85da5f7033e9adbdbac2d72355b7b86beb7a6.zip
For bug #158503, allow --nodeps to override blockers.
svn path=/main/trunk/; revision=5321
-rwxr-xr-xbin/emerge7
1 files changed, 5 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge
index edccaf4fc..1a41d96c6 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -925,7 +925,9 @@ class depgraph:
self.spinner.update()
if mytype == "blocks":
- if addme and "--buildpkgonly" not in self.myopts and myparent:
+ if myparent and \
+ "--buildpkgonly" not in self.myopts and \
+ "--nodeps" not in self.myopts:
mybigkey[1] = myparent[1]
self.blocker_parents.setdefault(
tuple(mybigkey), set()).add(myparent)
@@ -1538,7 +1540,8 @@ class depgraph:
correct merge order such that mutually blocking packages are never
installed simultaneously."""
- if "--buildpkgonly" in self.myopts:
+ if "--buildpkgonly" in self.myopts or \
+ "--nodeps" in self.myopts:
return True
#if "deep" in self.myparams: