From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web12.943.1588206023285360849 for ; Wed, 29 Apr 2020 17:20:23 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: erik.c.bjorge@intel.com) IronPort-SDR: u6k4AV1KcbwHXT0VMtrhpGx0XWSyjyubB1tpGB7AkpziCRhGHNDwy4p4e0Hzi17ua+ZGDz6zW6 G9qTv9vorvOw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Apr 2020 17:20:22 -0700 IronPort-SDR: 3Ksax0Jb5xmLaRQSoA7vFs8cpvDsxYbZ6WfZD4Helca/zTZ8o7rxxjcGkkZiFAd+q4pwaapKm9 UPINvBj7yHAQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,333,1583222400"; d="scan'208";a="249593686" Received: from ecbjorge-mobl1.amr.corp.intel.com ([10.212.108.97]) by fmsmga008.fm.intel.com with ESMTP; 29 Apr 2020 17:20:22 -0700 From: "Bjorge, Erik C" To: devel@edk2.groups.io Cc: Ashley E Desimone , Nate DeSimone , Puja Pandya , Bret Barkelew , Prince Agyeman Subject: [edk2-staging/EdkRepo] [PATCH v1] EdkRepo: Fix running from source detection Date: Wed, 29 Apr 2020 17:19:24 -0700 Message-Id: <2e8ee738bfe1df4876ba0133a1ad98a5c2ce8d9d.1588205878.git.erik.c.bjorge@intel.com> X-Mailer: git-send-email 2.21.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Code did not add user site packages if they were enabled. This caused edkrepo installed in the user site packages as being run from source. Signed-off-by: Erik Bjorge Cc: Ashley E Desimone Cc: Nate DeSimone Cc: Puja Pandya Cc: Bret Barkelew Cc: Prince Agyeman --- edkrepo/edkrepo_entry_point.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/edkrepo/edkrepo_entry_point.py b/edkrepo/edkrepo_entry_point.py index 76a5a18..b1c08d4 100644 --- a/edkrepo/edkrepo_entry_point.py +++ b/edkrepo/edkrepo_entry_point.py @@ -27,6 +27,8 @@ import edkrepo #Prefer the site-packages version of edkrepo sitepackages = site.getsitepackages() +if site.ENABLE_USER_SITE: + sitepackages.append(site.getusersitepackages()) sys.path = sitepackages + sys.path edkrepo_site_dir = None edkrepo_package_path = os.path.dirname(os.path.dirname(edkrepo.__file__)) -- 2.21.0.windows.1