diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-09-26 04:20:22 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-09-26 04:20:22 +0000 |
| commit | 977598fd054ef4e9349e7ca8ea648ebd7dfb7663 (patch) | |
| tree | 78cea119b54db4f984f6ecbc3d6f330ec1a0327b /bin/emerge | |
| parent | 100fdc5db0d85916bebe1313916931f00cb3fc77 (diff) | |
| download | portage-977598fd054ef4e9349e7ca8ea648ebd7dfb7663.tar.gz portage-977598fd054ef4e9349e7ca8ea648ebd7dfb7663.tar.bz2 portage-977598fd054ef4e9349e7ca8ea648ebd7dfb7663.zip | |
Bug #190781 - Don't include --oneshot in the options that
--update implies. (trunk r7790)
svn path=/main/branches/2.1.2/; revision=7821
Diffstat (limited to 'bin/emerge')
| -rwxr-xr-x | bin/emerge | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge index f3d6d95f1..535dd1076 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1643,8 +1643,7 @@ class depgraph: arg_atoms = greedy_atoms oneshot = "--oneshot" in self.myopts or \ - "--onlydeps" in self.myopts or \ - "--update" in self.myopts + "--onlydeps" in self.myopts """ These are used inside self.create() in order to ensure packages that happen to match arguments are not incorrectly marked as nomerge.""" args_set = self._sets["args"] |