From nobody Mon May 6 15:50:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+58345+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+58345+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1588206024; cv=none; d=zohomail.com; s=zohoarc; b=J5KqP2NoCMRI1+jYjEyFORmQggEgi1jFjA6TrLJE7yhVv0XvyGIt6ozvTQY3jnXEUJ+qJI10RBhtKTuQNjom8QXioKbazM1qQgHCE9U7OlgL1PlmYWwox3TjRsYaXOvSpceHnaltkOA+Twlc0DUGYKTgphqM5J7giDiII5XlS9Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588206024; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=5fJQoXIWJfV9m4vnXnj4Klit0MDgoryTBKdGsCezDbw=; b=QlKhi8CaMruiEPRyRfMBDq5ainVxGxlJtwh/qnmknkUO0XgaiefbZWepksTArDJokFtnLmTzmRsxsGO3f5vm8NWo+HBPhVzi+7+0Sedlko4FbcTKeDidaz3jKx3v9bIpp07Ox/bZP+CAdk+3c6bsGbDbyjHGz6G5CW3dGuMp3sQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+58345+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1588206024528915.7831243497537; Wed, 29 Apr 2020 17:20:24 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id uPvZYY1788612xE0XstASIO9; Wed, 29 Apr 2020 17:20:24 -0700 X-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 IronPort-SDR: u6k4AV1KcbwHXT0VMtrhpGx0XWSyjyubB1tpGB7AkpziCRhGHNDwy4p4e0Hzi17ua+ZGDz6zW6 G9qTv9vorvOw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-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" X-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-devel] [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> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: <27952.devel.edk2.groups.io> Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,erik.c.bjorge@intel.com X-Gm-Message-State: 8IowDbXgQxaUxD9LLMpo5KQWx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1588206024; bh=EhEgPhBBHjuG6I7OKFq00w3upTTkbR71QBHqL+zLLvc=; h=Cc:Date:From:Reply-To:Subject:To; b=QxTeHC0FX4/r+FH0uT2CC1PF20OD9e+s7MXLSKkuVTArb3b6NOTdM2u4g/DF3hE8Uih RbzIF1yHveJCcYsmwYj/vOI/OeDbWkD33YgdVR44Ob/pbl7y81JVRWS+/5+ofZ43p1hhA 5A3NfIlzCAY6s4TxPdb2FOof/m+zRKZubEo= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Nate DeSimone --- 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 =20 #Prefer the site-packages version of edkrepo sitepackages =3D site.getsitepackages() +if site.ENABLE_USER_SITE: + sitepackages.append(site.getusersitepackages()) sys.path =3D sitepackages + sys.path edkrepo_site_dir =3D None edkrepo_package_path =3D os.path.dirname(os.path.dirname(edkrepo.__file__)) --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#58345): https://edk2.groups.io/g/devel/message/58345 Mute This Topic: https://groups.io/mt/73366333/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-