diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-09-02 23:24:24 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-09-02 23:24:24 +0000 |
| commit | 9a276247dafe0626785eda4c176d13c50bb9f5c0 (patch) | |
| tree | ff85c0fe03929322fd3c53006e1b51f77ae7932c | |
| parent | 3346648a71eb2896797a6de195e85146c4d1dcf4 (diff) | |
| download | portage-9a276247dafe0626785eda4c176d13c50bb9f5c0.tar.gz portage-9a276247dafe0626785eda4c176d13c50bb9f5c0.tar.bz2 portage-9a276247dafe0626785eda4c176d13c50bb9f5c0.zip | |
Make code from the last 2 commits conditional on merging == 0 and vardbapi.cpv_exists(mykey).
svn path=/main/trunk/; revision=4380
| -rwxr-xr-x | bin/emerge | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/bin/emerge b/bin/emerge index 136080e49..5bcb6eaa4 100755 --- a/bin/emerge +++ b/bin/emerge @@ -774,6 +774,8 @@ class depgraph: mybigkey.append("merge") else: mybigkey.append("nomerge") + + if merging == 0 and vardbapi.cpv_exists(mykey): myuse = vardbapi.aux_get(mykey, ["USE"])[0].split() self.useFlags[myroot][mykey] = myuse |