From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web11.1411.1588648324974265750 for ; Mon, 04 May 2020 20:12:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=GIE8tCc/; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: nathaniel.l.desimone@intel.com) IronPort-SDR: Jh8x4XE3ANecAnFBRMFDnLq+PI1cvJ+56PulrJQDJwQ8O0hqKXxvAecMkAu8chH+AUQb+MAaii /yEMSg+4bLSw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 May 2020 20:12:04 -0700 IronPort-SDR: +0e3p8xTAaJzzjFHT3DYfjOW7wUCRI5kL9uty7Q5l0gaXULSYE1LtpEfLeYR7oW/VeQcr+VXkH Nkh1l5A/T3WQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,354,1583222400"; d="scan'208";a="304357448" Received: from orsmsx105.amr.corp.intel.com ([10.22.225.132]) by FMSMGA003.fm.intel.com with ESMTP; 04 May 2020 20:12:03 -0700 Received: from orsmsx163.amr.corp.intel.com (10.22.240.88) by ORSMSX105.amr.corp.intel.com (10.22.225.132) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 4 May 2020 20:12:03 -0700 Received: from ORSEDG002.ED.cps.intel.com (10.7.248.5) by ORSMSX163.amr.corp.intel.com (10.22.240.88) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 4 May 2020 20:12:03 -0700 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.100) by edgegateway.intel.com (134.134.137.101) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 4 May 2020 20:12:03 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PkjKOwQTjWd7OY7swGg4oQKKTXhWrI9d1IHbTOfI6iwvi8jlDfuU+8uxDPNmHsWXIYGosz5ReYqNM48IBkInPTWlkU6h5WkJjM51Osy/PlczQk4W36vSxKqKSpOSqXE/XTKzWGJhqSB3mvrlwYN0alfFelI8WwY7mct89zx2iROgwHlvulbxYytdANx1gy3o3F/LjLCh4nNGZWLTdcYEcDm70k0PyMvi3YUpplfAYndq1rjGe4+JzVBX1cuUFIyp8J/QTt1MatywsGP+pS2kLgaGhTssUyGBNYQ3XEEIMyFomIWMrlcGIf+t8mNxtc5a+KHDwf0EIlyicQqn6io3VA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ThLFojqRdoVq7fmkCss5boOtV34fjWrIV1kR94jV18k=; b=lUrbxNT5UUqIyfXeq7mWbUZSd874TFCCc44eeJHOFe3x4qadZGF1kqOOySm4CUmGprYd5+sReZlqw2Q3J6qe/Y2AXlIdZcdpvKtIDcSLRcLcs+GuXmHNbMBGRM08aWjGA5rGjQS6Aq1jVZP23d1hEWcbO6svpQ5KhO4n4MZFvlIf8NHY7oGHXdRWdytgIQ4qUqUrSOjU34c25c0Pdqik4PppNAchhVk6iCuCYF10J0KasRy9nWcQ2XtT/rVAHkRTnVmXOeosEdKW4JsvPKRjt5WnHc40q3CVrX16Z3HhbPyp6Mx6xOD71qxcbRj2cclFKRjv1a5N2peKBbExYGB8HQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ThLFojqRdoVq7fmkCss5boOtV34fjWrIV1kR94jV18k=; b=GIE8tCc/b1HQCig02x36TNQGy5BivkngRszIDSBKfTtWxCFxQ0gvg+0OIbJ14cx4kcRTU6mOAMnxjmjjn59qyTVEgyp1wrK/gACbbj4jHckCQETNOkpU7uoHME1RGdFTy3HWz86np6W4WkeJNAnpwbfmrG7StwV+9ShB2lYL9cI= Received: from BL0PR11MB3489.namprd11.prod.outlook.com (2603:10b6:208:75::29) by BL0PR11MB3204.namprd11.prod.outlook.com (2603:10b6:208:60::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.27; Tue, 5 May 2020 03:12:02 +0000 Received: from BL0PR11MB3489.namprd11.prod.outlook.com ([fe80::d0f8:bfd7:bae2:3e42]) by BL0PR11MB3489.namprd11.prod.outlook.com ([fe80::d0f8:bfd7:bae2:3e42%7]) with mapi id 15.20.2958.030; Tue, 5 May 2020 03:12:02 +0000 From: "Nate DeSimone" To: "Bjorge, Erik C" , "devel@edk2.groups.io" CC: "Desimone, Ashley E" , "Pandya, Puja" , Bret Barkelew , "Agyeman, Prince" Subject: Re: [edk2-staging/EdkRepo] [PATCH v1] EdkRepo: Fix running from source detection Thread-Topic: [edk2-staging/EdkRepo] [PATCH v1] EdkRepo: Fix running from source detection Thread-Index: AQHWHoU1uIf00ErFUE6vP5O5D0ToiqiY2L4w Date: Tue, 5 May 2020 03:12:01 +0000 Message-ID: References: <2e8ee738bfe1df4876ba0133a1ad98a5c2ce8d9d.1588205878.git.erik.c.bjorge@intel.com> In-Reply-To: <2e8ee738bfe1df4876ba0133a1ad98a5c2ce8d9d.1588205878.git.erik.c.bjorge@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYmMxMDgyMDYtNjYxMC00NmU4LTk2MDktODdmODk3YTlkYTBhIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiR01YaitGWk5POFBVM1k0dEVXTlR3V1lNXC8yMStRcEMyaytzdVNTWE5nTldjKzBrWVZTUTVcL0FCSzNiMmJzdXArIn0= dlp-reaction: no-action dlp-version: 11.2.0.6 dlp-product: dlpe-windows x-ctpclassification: CTP_NT authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.55.52.200] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 97cd3cea-e670-4b62-0f50-08d7f0a214da x-ms-traffictypediagnostic: BL0PR11MB3204: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5516; x-forefront-prvs: 0394259C80 x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: DshX9FEKwvwogfo1FbcbnGiopCGsxwBoV3hVwV3PvGPGXGNfaF4SLe34oDlSeI6nmQLots0mmi2MISiCqULTrncxmOEV9zZaM2ndMpA0NKbaob0rHb+1PlxMOgJU3oaXQlxsSnu8BrJnCEo8hFqmgo03WQ0H61ikJV7LKMrRyy5JuyjFzVfLdsVtxi5gli+McJoBwSeDuDdL7lPx6oqooGWj4gYNNM/3AVdCCwNSUWVEMOY+VTJaWDX8R1DYeQ0dguVc0KlORQ+Ve6LZfG0yMLzmjdX7nxcZZ3Ks1X/o10evxYWFZ96Uw16/+XG8Al9b6NIuYpAGQ1ZhP5irSw7kMRJYU4FD6iPcKFAGWv1TrjuICDoaNFuQh/CADKetF6GWUZLSoOA/B0qXz31GTJgBERZd8oX3H79L9qXklG6JGG9tRi4MwtEg2TGGntYQIVJkRSudP7PmKaA7L5V6if0JqJQnU60gdYL2gD4u48nEWh74+SjZfKAxO82lB/W2EDviXDqpdttoi4SLumy8D31nAA== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL0PR11MB3489.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(396003)(39860400002)(376002)(346002)(366004)(136003)(33430700001)(64756008)(66556008)(66446008)(66946007)(66476007)(4326008)(71200400001)(55016002)(52536014)(54906003)(316002)(107886003)(9686003)(110136005)(33440700001)(33656002)(8676002)(8936002)(26005)(186003)(86362001)(2906002)(6506007)(53546011)(478600001)(7696005)(76116006)(5660300002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: FnjAHmYRu0Yx/KUaNsbu7gHsAdg6gspoib8TFh1egdLPM/o/KkL1q0hA9uYA+3pVTgjAOMg0i9Q2bpQvIViyXrQdyW7g6xe4zoZetj1cq7scxqC9BsTLEVMiVm+a6QkxrZjRr/VrFDDlYvaIo4NA0w04MhmgtXn4Jqmn9DpJJAvYYZ4EuHfShH41U0d6+EwXgQOsjmriVAwnn2NJt+ppY2bRx8sU3uIHSRx3begoIggNfIj+7gDcOG7ZjQTX4oHNVRVdpiiY8GvGABTvjQ2jn09V0N6BQauewkuFG8nKEKuiO+821+gKC/EMSimaHCd4/RGn8qc+sc59227lMlWpnwt3SksmmlDHCvPKwzn/MOb6FO72MW1FYu6FEhIMiFBZ5yEYeQ7r59p3okCMwjUR4I19kFic6NkhOHOxC3rKuUZ20f9ZwkKva2IiGOOZFS1AcjNppKBpBdNiNHasZL5t8iOE3BNiF/Md8Dsucvzg8Y2kDjNTXG6GENgeAHu0BUBLHRY8a3GeYp3yiM5Z3M7f1RxzbNKUpUgNDRrxQJEGJZ3+wJ8nFfU2xefj06xH9x9z/5hS2/8BLCtSh3IFLFvMHHxhCVaVxA+JYl8paHhvz/Ec9EXuWtAqqDcxrGrNKl7lSq7EKG9jWKFYUyM0C0mSIycoxbzrYWojt3vKCxi276KOMW4cj4na4fPVfztnh2fxjQAtbpk+q+RLbmOBeBwQuu7MUjGytpIQ1mkw6w+h4XnFEY9SJqALtdPotzTWLE+FhlaD8lKyV8Ab3z+z4+CHk2qq4mzvTB7o30a0wsUiR/s= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 97cd3cea-e670-4b62-0f50-08d7f0a214da X-MS-Exchange-CrossTenant-originalarrivaltime: 05 May 2020 03:12:02.0058 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: n7kzpwJ4eem0X9+M9P4T+BnPiRezYppTW9iOIFATLSYSJnff6YBPFrIOMAF8E8kBHY2+elv9i+8kBZJPOJxTTAhpg/ZfCsXBTDJfwhT8DDU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR11MB3204 Return-Path: nathaniel.l.desimone@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Nate DeSimone -----Original Message----- From: Bjorge, Erik C =20 Sent: Wednesday, April 29, 2020 5:19 PM To: devel@edk2.groups.io Cc: Desimone, Ashley E ; Desimone, Nathaniel L= ; Pandya, Puja ; Br= et Barkelew ; Agyeman, Prince 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 edkr= epo 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.p= y 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.getsit= epackages() +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__)= ) -- 2.21.0.windows.1