diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-09-18 20:17:44 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-09-18 20:17:44 -0700 |
| commit | 343418c4cbd1c0dbf65583adeab618db09efea6c (patch) | |
| tree | 1ca1eca7d1595282b05a358802bcabb2040fb891 | |
| parent | 81e0f87b5c1da0ebc531d89846135b72743e71e0 (diff) | |
| download | portage-343418c4cbd1c0dbf65583adeab618db09efea6c.tar.gz portage-343418c4cbd1c0dbf65583adeab618db09efea6c.tar.bz2 portage-343418c4cbd1c0dbf65583adeab618db09efea6c.zip | |
bin/ebuild: simplify PORTDIR_OVERLAY queryv2.2.0_alpha59
There's no need to query os.environ here, because portage.settings
will inherit the value automatically.
| -rwxr-xr-x | bin/ebuild | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/bin/ebuild b/bin/ebuild index f47975aad..1cbdb2d7a 100755 --- a/bin/ebuild +++ b/bin/ebuild @@ -134,11 +134,7 @@ vdb_path = os.path.realpath(os.path.join(portage.settings['EROOT'], VDB_PATH)) # Make sure that portdb.findname() returns the correct ebuild. if ebuild_portdir != vdb_path and \ ebuild_portdir not in portage.portdb.porttrees: - portdir_overlay = os.environ.get("PORTDIR_OVERLAY") - if portdir_overlay is None: - portdir_overlay = portage.settings.get("PORTDIR_OVERLAY") - if portdir_overlay is None: - portdir_overlay = "" + portdir_overlay = portage.settings.get("PORTDIR_OVERLAY", "") if sys.hexversion >= 0x3000000: os.environ["PORTDIR_OVERLAY"] = \ portdir_overlay + \ |