From c69f4d3da83a7f83be750f771acee109e6df041b Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 15 Oct 2011 14:43:32 -0700 Subject: [PATCH] bin/ebuild: don't set PORTAGE_CALLER This removes the last reference to PORTAGE_CALLER. --- bin/ebuild | 1 - pym/portage/package/ebuild/_config/special_env_vars.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/ebuild b/bin/ebuild index 334b36897..771ccb51c 100755 --- a/bin/ebuild +++ b/bin/ebuild @@ -56,7 +56,6 @@ parser.add_option("--skip-manifest", help="skip all manifest checks", opts, pargs = parser.parse_args(args=sys.argv[1:]) -os.environ["PORTAGE_CALLER"]="ebuild" try: import portage except ImportError: diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym/portage/package/ebuild/_config/special_env_vars.py index 517fdf35a..87dccb193 100644 --- a/pym/portage/package/ebuild/_config/special_env_vars.py +++ b/pym/portage/package/ebuild/_config/special_env_vars.py @@ -143,7 +143,7 @@ environ_filter += [ "FETCHCOMMAND_RSYNC", "FETCHCOMMAND_SFTP", "GENTOO_MIRRORS", "NOCONFMEM", "O", "PORTAGE_BACKGROUND", "PORTAGE_BACKGROUND_UNMERGE", - "PORTAGE_BINHOST_CHUNKSIZE", "PORTAGE_BUILDIR_LOCKED", "PORTAGE_CALLER", + "PORTAGE_BINHOST_CHUNKSIZE", "PORTAGE_BUILDIR_LOCKED", "PORTAGE_ELOG_CLASSES", "PORTAGE_ELOG_MAILFROM", "PORTAGE_ELOG_MAILSUBJECT", "PORTAGE_ELOG_MAILURI", "PORTAGE_ELOG_SYSTEM", -- 2.26.2