diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-07-22 06:48:32 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-07-22 06:48:32 +0000 |
| commit | 6193d9f9c4457e61c43c71f5838baf656217ae01 (patch) | |
| tree | 870b4db718095909052be9eed7847d9c4a4c29f4 /bin/emerge | |
| parent | 022319f8b20f1713a4daa79f436b263735e42839 (diff) | |
| download | portage-6193d9f9c4457e61c43c71f5838baf656217ae01.tar.gz portage-6193d9f9c4457e61c43c71f5838baf656217ae01.tar.bz2 portage-6193d9f9c4457e61c43c71f5838baf656217ae01.zip | |
Make --update imply --oneshot since people often us it to update things when they don't want to add them to world. Thanks to jakub for the suggestion. (trunk r7349)
svn path=/main/branches/2.1.2/; revision=7350
Diffstat (limited to 'bin/emerge')
| -rwxr-xr-x | bin/emerge | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge index 84cd16a5d..988580c43 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1650,7 +1650,9 @@ class depgraph: greedy_atoms.append((myarg, myslot_atom)) arg_atoms = greedy_atoms - oneshot = "--oneshot" in self.myopts or "--onlydeps" in self.myopts + oneshot = "--oneshot" in self.myopts or \ + "--onlydeps" in self.myopts or \ + "--update" 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"] |