diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-12-13 21:22:25 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-12-13 21:22:25 +0000 |
| commit | 46598207a7e6b22189269d8a815b98b7bc567b15 (patch) | |
| tree | 114a3f9c0601852338a2363bfa6718bcd1ee4a6c /bin | |
| parent | e8e6e618b20b14a24c140cdc3622b7b3ccd5bf90 (diff) | |
| download | portage-46598207a7e6b22189269d8a815b98b7bc567b15.tar.gz portage-46598207a7e6b22189269d8a815b98b7bc567b15.tar.bz2 portage-46598207a7e6b22189269d8a815b98b7bc567b15.zip | |
Add --buildpkgonly to the options lists that exempt from
slot collisions and world file updates. (trunk r8917)
svn path=/main/branches/2.1.2/; revision=8918
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge index f174585c9..608c1ba9b 100755 --- a/bin/emerge +++ b/bin/emerge @@ -2375,7 +2375,8 @@ class depgraph: def _accept_collisions(self): acceptable = False - for x in ("--nodeps", "--pretend", "--fetchonly", "--fetch-all-uri"): + for x in ("--buildpkgonly", "--fetchonly", + "--fetch-all-uri", "--nodeps", "--pretend"): if x in self.myopts: acceptable = True break @@ -3458,7 +3459,7 @@ class depgraph: def saveNomergeFavorites(self): """Find atoms in favorites that are not in the mergelist and add them to the world file if necessary.""" - for x in ("--fetchonly", "--fetch-all-uri", + for x in ("--buildpkgonly", "--fetchonly", "--fetch-all-uri", "--oneshot", "--onlydeps", "--pretend"): if x in self.myopts: return |