* [edk2-staging/EdkRepo] [PATCH v1] EdkRepo: Fix running from source detection
@ 2020-04-30 0:19 Bjorge, Erik C
2020-05-05 3:12 ` Nate DeSimone
2020-05-05 3:24 ` Nate DeSimone
0 siblings, 2 replies; 3+ messages in thread
From: Bjorge, Erik C @ 2020-04-30 0:19 UTC (permalink / raw)
To: devel
Cc: Ashley E Desimone, Nate DeSimone, Puja Pandya, Bret Barkelew,
Prince Agyeman
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@intel.com>
Cc: Ashley E Desimone <ashley.e.desimone@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Prince Agyeman <prince.agyeman@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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [edk2-staging/EdkRepo] [PATCH v1] EdkRepo: Fix running from source detection
2020-04-30 0:19 [edk2-staging/EdkRepo] [PATCH v1] EdkRepo: Fix running from source detection Bjorge, Erik C
@ 2020-05-05 3:12 ` Nate DeSimone
2020-05-05 3:24 ` Nate DeSimone
1 sibling, 0 replies; 3+ messages in thread
From: Nate DeSimone @ 2020-05-05 3:12 UTC (permalink / raw)
To: Bjorge, Erik C, devel@edk2.groups.io
Cc: Desimone, Ashley E, Pandya, Puja, Bret Barkelew, Agyeman, Prince
Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
-----Original Message-----
From: Bjorge, Erik C <erik.c.bjorge@intel.com>
Sent: Wednesday, April 29, 2020 5:19 PM
To: devel@edk2.groups.io
Cc: Desimone, Ashley E <ashley.e.desimone@intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Pandya, Puja <puja.pandya@intel.com>; Bret Barkelew <Bret.Barkelew@microsoft.com>; Agyeman, Prince <prince.agyeman@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@intel.com>
Cc: Ashley E Desimone <ashley.e.desimone@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Prince Agyeman <prince.agyeman@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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [edk2-staging/EdkRepo] [PATCH v1] EdkRepo: Fix running from source detection
2020-04-30 0:19 [edk2-staging/EdkRepo] [PATCH v1] EdkRepo: Fix running from source detection Bjorge, Erik C
2020-05-05 3:12 ` Nate DeSimone
@ 2020-05-05 3:24 ` Nate DeSimone
1 sibling, 0 replies; 3+ messages in thread
From: Nate DeSimone @ 2020-05-05 3:24 UTC (permalink / raw)
To: Bjorge, Erik C, devel@edk2.groups.io
Cc: Desimone, Ashley E, Pandya, Puja, Bret Barkelew, Agyeman, Prince
Pushed: https://github.com/tianocore/edk2-staging/commit/1bacbe66
-----Original Message-----
From: Bjorge, Erik C <erik.c.bjorge@intel.com>
Sent: Wednesday, April 29, 2020 5:19 PM
To: devel@edk2.groups.io
Cc: Desimone, Ashley E <ashley.e.desimone@intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Pandya, Puja <puja.pandya@intel.com>; Bret Barkelew <Bret.Barkelew@microsoft.com>; Agyeman, Prince <prince.agyeman@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@intel.com>
Cc: Ashley E Desimone <ashley.e.desimone@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Prince Agyeman <prince.agyeman@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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-05-05 3:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-30 0:19 [edk2-staging/EdkRepo] [PATCH v1] EdkRepo: Fix running from source detection Bjorge, Erik C
2020-05-05 3:12 ` Nate DeSimone
2020-05-05 3:24 ` Nate DeSimone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox