[edk2-devel] [edk2-staging/EdkRepo] [PATCH v1] EdkRepo: Fix running from source detection

[Nate DeSimone]

Reviewed-by: Nate DeSimone <nathaniel.l.desimone at intel.com>

-----Original Message-----
From: Bjorge, Erik C <erik.c.bjorge at intel.com> 
Sent: Wednesday, April 29, 2020 5:19 PM
To: devel at edk2.groups.io
Cc: Desimone, Ashley E <ashley.e.desimone at intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone at intel.com>; Pandya, Puja <puja.pandya at intel.com>; Bret Barkelew <Bret.Barkelew at microsoft.com>; Agyeman, Prince <prince.agyeman at intel.com>
Subject: [edk2-staging/EdkRepo] [PATCH v1] EdkRepo: Fix running from source detection

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 <erik.c.bjorge at intel.com>
Cc: Ashley E Desimone <ashley.e.desimone at intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone at intel.com>
Cc: Puja Pandya <puja.pandya at intel.com>
Cc: Bret Barkelew <Bret.Barkelew at microsoft.com>
Cc: Prince Agyeman <prince.agyeman at intel.com>
---
 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


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#58593): https://edk2.groups.io/g/devel/message/58593
Mute This Topic: https://groups.io/mt/73366333/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-