From 343418c4cbd1c0dbf65583adeab618db09efea6c Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 18 Sep 2011 20:17:44 -0700 Subject: [PATCH] bin/ebuild: simplify PORTDIR_OVERLAY query There's no need to query os.environ here, because portage.settings will inherit the value automatically. --- bin/ebuild | 6 +----- 1 file changed, 1 insertion(+), 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 + \ -- 2.26.2