From: "Nate DeSimone" <nathaniel.l.desimone@intel.com>
To: "Bjorge, Erik C" <erik.c.bjorge@intel.com>,
"devel@edk2.groups.io" <devel@edk2.groups.io>
Cc: "Desimone, Ashley E" <ashley.e.desimone@intel.com>,
"Pandya, Puja" <puja.pandya@intel.com>,
Bret Barkelew <Bret.Barkelew@microsoft.com>,
"Agyeman, Prince" <prince.agyeman@intel.com>
Subject: Re: [edk2-staging/EdkRepo] [PATCH v1] EdkRepo: Fix running from source detection
Date: Tue, 5 May 2020 03:12:01 +0000 [thread overview]
Message-ID: <BL0PR11MB3489B35632D562542981ACDCCDA70@BL0PR11MB3489.namprd11.prod.outlook.com> (raw)
In-Reply-To: <2e8ee738bfe1df4876ba0133a1ad98a5c2ce8d9d.1588205878.git.erik.c.bjorge@intel.com>
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
next prev parent reply other threads:[~2020-05-05 3:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2020-05-05 3:24 ` Nate DeSimone
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=BL0PR11MB3489B35632D562542981ACDCCDA70@BL0PR11MB3489.namprd11.prod.outlook.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox