From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web12.1538.1588649094207652616 for ; Mon, 04 May 2020 20:24:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=eJf+gTQQ; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: nathaniel.l.desimone@intel.com) IronPort-SDR: m68p6tuIEaOpeap/9b7FHSMuijVKGMyeZpMSiXjVXA+RtbsFIbPEmlFM/hHALB8bIDPUZGeJ1/ vLk6RjVQEJrA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 May 2020 20:24:53 -0700 IronPort-SDR: yiIdVhhem+k7txsCvNeJwt/9jejnL0KToEsSFz60UvfJlqT59gz/pQ5y7STWLXyRKc8UPT9Y5n fqyKj9SJ6NCQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,354,1583222400"; d="scan'208";a="263017831" Received: from orsmsx110.amr.corp.intel.com ([10.22.240.8]) by orsmga006.jf.intel.com with ESMTP; 04 May 2020 20:24:53 -0700 Received: from ORSEDG002.ED.cps.intel.com (10.7.248.5) by ORSMSX110.amr.corp.intel.com (10.22.240.8) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 4 May 2020 20:24:52 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.172) by edgegateway.intel.com (134.134.137.101) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 4 May 2020 20:24:52 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RFqbgizd3uCmMGYiLlRrDZRum+PoowuZmlx+CacMT/bfYuBMcowZZs83F6bWZBp32QWV03cSf5T/biMt5qs5HRWoxgx6zoHjJzkG0KaNj3K6H/cYvxwcpdPRXmA0YGqcS+oD2XL9vgOy1yBYV+MdumrJxAlF77MLMgAUbYtxpN8cWnmnXpjN7Us950WP4/DUMtsSHeQfmxNDSUjaRRCeshncB3T0idoaaWEtb+j0pHvUNw18RiBr2h+h2ko+73J8uHCNqLzVW4VulPkz9LVaG6cRST+UfcqZBD36nIw+Ww3qNXDBZHonsFmxeqVgbY+mtFOqY3eK8g5VBrDnigmisg== 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=cVhBymNNMZMhlFhwfcNsUfIyh3uNT/FTaV3njjHG9gQ=; b=BBKSjNRkN9BFCGgWtGW/vbEWw3cDzbEaYn+WGdDRSkCSME19OZ2ecs3KKOJD9rBXamAE6mLHUADgAN2IzF2ZtrWt3bTd0A3Ed15m852cMvVErUXjmpuIR/ysb8jZRLWhUP187ZXw5GAKB3ouPAQPCjqay4PdNsl/rFBrAek7ZcA4juQkZz0KPTINWRYlgn8UznEFxwDq6kuRwKx05TG3FsnwML/yz52NV5T1dvXgXe4LXf5hALuisYc85S/cYEbpvuFoTWCTsBbVHQr0m+7cEf1xtAVNFH9ZGdavIQIKCWl+RNkgrhxE1f4zP04YYZvD5euo2msjAWffMPAzaRh8bQ== 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=cVhBymNNMZMhlFhwfcNsUfIyh3uNT/FTaV3njjHG9gQ=; b=eJf+gTQQ7j+Msl2tFjlx7Ob8pEnBZ08V4VfpQa5bQmXmmS32Tv4RqSZQdHkr00mx6vx8mt9effRRLcwluQMg36lhV5Zn8riVN1zxmi/kDZ/xImaW4wFhARyusw0TdW1aV45sBJ9dcJvIr5wiJwO+f1kl6JnDAMiuIPSYR3pxx7I= Received: from BL0PR11MB3489.namprd11.prod.outlook.com (2603:10b6:208:75::29) by BL0PR11MB2883.namprd11.prod.outlook.com (2603:10b6:208:7b::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20; Tue, 5 May 2020 03:24:51 +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:24:51 +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: AQHWHoU1uIf00ErFUE6vP5O5D0ToiqiY3ASA Date: Tue, 5 May 2020 03:24:51 +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: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYWE4ZDk1MmEtNzNmYy00NTdiLWFhYTEtZGFlNTVmNWFmYzZlIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiMkYxbUd5UTNIRG4yM1ZDcWVQNE1cLzgzSCtBWWRNRDc3RG5mK2I0SEdKQmZtbkR2RFhlR0xmWGI3VUlUMlg0UEQifQ== 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: 245ea36c-2876-4b08-a8d8-08d7f0a3df82 x-ms-traffictypediagnostic: BL0PR11MB2883: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:541; x-forefront-prvs: 0394259C80 x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 4q0/49Ag5mCVvHTmAeLaZABeXf0HGEc4m5QwB23NlFpTGoqTVpKKXOv5ORYA8d9opqjleuSjdQPJaAVoWVU68RaxJHL9XBIqlDhgqYpfNXtatpmzKeNtLIJ7MgJd58s/+05oL3UmrYYNrgTg0ekHDEdFfOb0CsNEswE7DRp96+p9B2Ok+HIWCLGEz/w/bCsKYxqjrU8Xxpr0kGnuIvDNWElssdZTtAT26v4Nc+RBWsZacoZu4vau4bsTnJ+zh4Ig15MNV5woBOOSSMk0G71ypMlUaYF9qCWLEI+xoEpoRkphkYbnNyv8K2ofOiePo6FDBlUAPGAFa8z8fQske/VyshUDQS/kBpTisCdgFvzzYNZzTGmJowX4kp+3/t6yY5nqXUjgFAO9yjtabOmEG11wyUH+LhSejizONitgRsVLrap5yazVZ4LAk0WuXuBz7lLxgv7l/g4tF8fZ5Woy2/depB7016C2zgC/KC+4INKd6xo0hH8Wy7m3lsG/xIwA/pmjJ/fy2dZi5vaMdHDZZ+0AFEMxBb1VMC7xBAZ6KSCG0/9Hki7ckORwJABLU+hb7chAkeZhhBWiv0pIchp6dguaTZ2rVeZSTAvqmVIElGZOTcw= 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:(376002)(39860400002)(136003)(396003)(366004)(346002)(33430700001)(76116006)(316002)(64756008)(66446008)(66476007)(7696005)(52536014)(66556008)(478600001)(54906003)(186003)(110136005)(26005)(33440700001)(6506007)(66946007)(53546011)(4326008)(5660300002)(33656002)(107886003)(86362001)(71200400001)(8676002)(9686003)(55016002)(2906002)(8936002)(966005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: EOkoh38cRXEkTDZQQ5XrIGRJHpydp0uc88GUbBIydUh3/cZKKHy38TKPAjhyq9htkKaCupktqB+PZNQn8wKa4NQPvjNKL2D31aWDi8NvV228O/eD4jjq73+LQHWSePRQPfqb7cq96f7lB0JPpHwbAnZS3iorNg9uhZNnrj5ll/vfBry9sKRJpq/7eX6bP+J9RIMHjpDJTosP3PXPt4zEE/DIFYAn0B4tc0Bhkt6WB89pukyt4P/91AnXp58ILw63Oxcm87+GIkFPzglPEExUj/dgTphAD0bwEOJCde/Q49fxiIoJlWWIn6y1l+NQ1PdeXlnjylXD3YZmQHAnlTWO+/zTmyfhJzWlq1hgjUCoDfXhm1hnbhoEPhEPbiE+Yj5N7E6nyDcWq6NaMVhl5A8rpRe3/l+RN+yLGjnkxZUP+SE80R91mWid7eM8eKoRCJ4p2PIAS2JCaJD93IXGNAJ6BMYaBdYZqFxWEWcE/S/zaAtkivTQ+QEoUOcxlLjGJp+PA9SmMKx/Lx0N9mbufr9LAtNv32V/6ijFmdHsEPsMVoB4qJUwqTBxYSYgriO33Dq3/inTybNm9YNt0j9MGy8B23+2z9Lx+1WgMM+MpfqrIF7+THPkyPCzqY1hd9dgc9CCKxgw+etGsfJtLE5RDVO/FeO9ScI9clef1tsHZ4KtHS51DT5aRQB5RH6vfpz0I9sJElCpSBNX6o+kYRmec8HzgouVlDqGcMIKZyIrYM/jUqatv9buhCIwJ5jNmIy4BfFyjgS45OALC0L/zJlG5/MkSVWDwIAOhTQcRIusy17SBMI= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 245ea36c-2876-4b08-a8d8-08d7f0a3df82 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 May 2020 03:24:51.5352 (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: mdd9+/IpfpveUS9lbujcb5C1g5AdMZOojPSqxwj2j9q879Tt13y0bXYAuIYKYCY4GJ0wUZvBLDBpTZHUjsp8GRkH6i6hMLSQBR3/mqny7FU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR11MB2883 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 Pushed: https://github.com/tianocore/edk2-staging/commit/1bacbe66 -----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