From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web11.3786.1587155295533141757 for ; Fri, 17 Apr 2020 13:28:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=ofzGCjay; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: erik.c.bjorge@intel.com) IronPort-SDR: atGkoNGjrjeBgq8cy9ysx01ntJWfBIFqr7TlqXS+gcru1tGfUtKNu537A3fyusjPG+iTfloZtl ltGxCtkUEKPA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Apr 2020 13:28:14 -0700 IronPort-SDR: +0q0NL7xoFptjlyAQIqn5uCO5Zd9wMxw5Zeqc5DDf/hQjmg0EnMaP0AJpSLIk2bcKKCFbXOm24 8udv0OlnO8nA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,395,1580803200"; d="scan'208";a="299707374" Received: from orsmsx107.amr.corp.intel.com ([10.22.240.5]) by FMSMGA003.fm.intel.com with ESMTP; 17 Apr 2020 13:28:14 -0700 Received: from orsmsx601.amr.corp.intel.com (10.22.229.14) by ORSMSX107.amr.corp.intel.com (10.22.240.5) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 17 Apr 2020 13:28:14 -0700 Received: from orsmsx605.amr.corp.intel.com (10.22.229.18) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Fri, 17 Apr 2020 13:28:13 -0700 Received: from ORSEDG001.ED.cps.intel.com (10.7.248.4) by orsmsx605.amr.corp.intel.com (10.22.229.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Fri, 17 Apr 2020 13:28:13 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.44) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 17 Apr 2020 13:28:13 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K94I4pfCAf8yQncD9HN2UNcWL7W82D6jqJbH0i4Kll7eq0f2ZbOYfYPxRGebUNCDHwK9Kd+m+tdik7DaLLhpQv5I8Elyls07pVrhcsdmigKYFkx3sxUBURj6HSxPJhu8FsvYp0E8mXmlOhVK9zizTs/U8pEKlmBOmzgfI3udCUrSDjVHUBoSaAVIB7cX4xPm41Citi29hz9rBm9ghh+w9jwbMoCQlhD53HdNCnaxCvxcuJaDQER5WDUFpaE3UUCRntCjcaa5P2DA4oYT/4Y8mSKx6qwxHvaobclP59mN4Y+mZgImKzD5PmqkBQV2r4OwVUyoCN7Jee1QJK8LMV7kIA== 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=SB/pDrA/tfDidLpb3xl6qfTvTl0IvuZQGLxlAgnpjfM=; b=kpKzpljbSkuE1Zsqub9EbjgJHT/Z1PxoA8w4xkVhLOUHjsd8D5uPdvwCNd3QML4T5VFMXvUvBoVgFSQntTcT2XNwPhODBDIsRUaUNnOGGtvxZOpVP0xrSCgPMCXMQHzHqqYpwL3Ns444KMogAcz8EpwbPxHQwxWkeZpjA0FWMOpGqDpImGH8SMqe2B3M/JUdQy/3a1PijUsSHZt3F/EgOgvznIj6yLWhJL6xRxWoKMD9BHCnUcHYYWdT/kSYuoNkwUqNYFNQRdGG0V18lA8+Y/EgP6p4h2nVGh0CrVN/yxlynQlm5Quo2bcTL5gqdUlGvFa2/9XzSv/5DABY7y7Kaw== 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=SB/pDrA/tfDidLpb3xl6qfTvTl0IvuZQGLxlAgnpjfM=; b=ofzGCjayeiHHUHLPJadA9/nVVeYDgfB/9vER1Vk5zQQGoFxx8WaLbLE1EuObYTXHS5nZST/TiUTIC+ttM3Ch/vfnvEtQt7K85IUyj0xYOqGeKxqF8QDw8bJ+082Kfr24WqFPXNqykSbweoHft7uJPGjseHlWx0Nohl57VEXLk3w= Received: from MW3PR11MB4554.namprd11.prod.outlook.com (2603:10b6:303:5d::7) by MW3PR11MB4761.namprd11.prod.outlook.com (2603:10b6:303:53::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2900.26; Fri, 17 Apr 2020 20:28:12 +0000 Received: from MW3PR11MB4554.namprd11.prod.outlook.com ([fe80::c569:9903:4c10:9281]) by MW3PR11MB4554.namprd11.prod.outlook.com ([fe80::c569:9903:4c10:9281%5]) with mapi id 15.20.2921.027; Fri, 17 Apr 2020 20:28:12 +0000 From: "Bjorge, Erik C" To: "Desimone, Ashley E" , "devel@edk2.groups.io" CC: "Desimone, Nathaniel L" , "Pandya, Puja" , Bret Barkelew , "Agyeman, Prince" Subject: Re: [edk2-staging/EdkRepo] [PATCH v2 5/6] EdkRepo: Move edkrepo_global_data directory to BaseConfig Thread-Topic: [edk2-staging/EdkRepo] [PATCH v2 5/6] EdkRepo: Move edkrepo_global_data directory to BaseConfig Thread-Index: AQHWFNxNh9rzGuzJ4UuRpHW1sThQSqh9w66g Date: Fri, 17 Apr 2020 20:28:12 +0000 Message-ID: References: <20200417171829.23032-1-ashley.e.desimone@intel.com> <20200417171829.23032-6-ashley.e.desimone@intel.com> In-Reply-To: <20200417171829.23032-6-ashley.e.desimone@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-reaction: no-action dlp-version: 11.2.0.6 dlp-product: dlpe-windows authentication-results: spf=none (sender IP is ) smtp.mailfrom=erik.c.bjorge@intel.com; x-originating-ip: [192.55.52.194] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 86dce78e-fbdd-4789-8178-08d7e30dda19 x-ms-traffictypediagnostic: MW3PR11MB4761: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:4125; x-forefront-prvs: 0376ECF4DD x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MW3PR11MB4554.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(10019020)(376002)(366004)(39860400002)(396003)(346002)(136003)(71200400001)(8676002)(81156014)(110136005)(54906003)(4326008)(7696005)(316002)(8936002)(478600001)(86362001)(55016002)(9686003)(2906002)(107886003)(53546011)(6506007)(186003)(66556008)(26005)(33656002)(52536014)(5660300002)(66946007)(66446008)(64756008)(66476007)(76116006);DIR:OUT;SFP:1102; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: ikcTLEQ63k4qaGWlOV5ch0LL0zyj65KdMacMv+5N+8XVj9+9rsg1ei3zmznwsiw85kIT4eDa5oA2fpZZNjBYhi3ZsRv0B3qS1je12mPEhFgQndtR3tbi/5nTA9cu1YDuWPIqiqcLX5wOayFwLxZHCHyNBduj1fMKBTAS3nx3H3DmIEYATeriUuR1RtXzxHp8jfTSd0LvIlbijXZe0ORfF9PlJrZ0/1sbD054oOirzxIKfZV6Zmr3LuhfCX5cLMipHHvWzmpWHaByRjMARCoMQzkMnnY/XkvCNIAskHp6Fotk/UwQggp/vS9UoAfvHIg336+/kUE0rrSfT2vPnrbHrhM7iAQAZXfb7uGOF2eorjQJvJlLHf7z172r3otxS8F6/j18AbQAtU9opoXBxxiE07QAU5fKe2bxfC/PXsdktHqIIOhHmkKXlT7lIaKl9v4A x-ms-exchange-antispam-messagedata: 073nrVzLmFI4Q6r3PJTV7Y8tXh+/AO3RydoCTE4kcqeZ+tIyrFnaKTB2a5+4P6xbbbPwAs1jcbFcNlqmVx84zSncW24ebMkqU9/LR7T03XrxpvTdofCQoQ2Icy6itRqZR/cUZIVFd0wvlnlb9npRYA== MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 86dce78e-fbdd-4789-8178-08d7e30dda19 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Apr 2020 20:28:12.8025 (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: qF7V6CEHtP1DkoJglpFjh87ElB/cjjPybl/6NTegqqOfuVyRm0l2dpmUb5+eEZ9Pwd4qdtNvvOVfSBXx53G6WQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR11MB4761 Return-Path: erik.c.bjorge@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Erik Bjorge -----Original Message----- From: Desimone, Ashley E =20 Sent: Friday, April 17, 2020 10:18 AM To: devel@edk2.groups.io Cc: Desimone, Nathaniel L ; Pandya, Puja ; Bjorge, Erik C ; Bret Barke= lew ; Agyeman, Prince Subject: [edk2-staging/EdkRepo] [PATCH v2 5/6] EdkRepo: Move edkrepo_global= _data directory to BaseConfig Move the edkrepo_global_data_directory from the GlobalConfig class to the b= ase config class. Updated the assignments of self.filename in both the GlobalConfig and the G= lobalUserConfig classes as well as the initializaion of the BaseConfig clas= s to use get_edkrepo_global_data_directory() Signed-off-by: Ashley E Desimone Cc: Nate DeSimone Cc: Puja Pandya Cc: Erik Bjorge Cc: Bret Barkelew Cc: Prince Agyeman --- edkrepo/config/config_factory.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/edkrepo/config/config_factory.py b/edkrepo/config/config_facto= ry.py index 1afa221..4ae06f6 100644 --- a/edkrepo/config/config_factory.py +++ b/edkrepo/config/config_factory.py @@ -77,10 +77,11 @@ class BaseConfig(): for the class. Property generation and verification is based off of a= list of CfgProp classes. """ prop_list =3D [] - def __init__(self, filename, read_only=3DTrue): + def __init__(self, filename, global_data_dir, read_only=3DTrue): # Do basic initialization of private variables self.read_only =3D read_only self.filename =3D filename + self.global_data_dir =3D global_data_dir self.cfg =3D configparser.ConfigParser(allow_no_value=3DTrue, deli= miters=3D'=3D') if os.path.isfile(self.filename): self.cfg.read(self.filename) @@ -132,8 +133,7 @@ class GlobalC= onfig(BaseConfig): edkrepo installer. """ def __init__(self): - self.edkrepo_global_data_directory =3D get_edkrepo_global_data_dir= ectory() - self.filename =3D os.path.join(self.edkrepo_global_data_directory,= "edkrepo.cfg") + self.filename =3D=20 + os.path.join(get_edkrepo_global_data_directory(), "edkrepo.cfg") self.prop_list =3D [ CfgProp('manifest-repo', 'URL', 'manifest_repo_url', None,= True), CfgProp('manifest-repo', 'Branch', 'manifest_repo_branch',= None, True), @@ -148,7 +148,7 @@ class GlobalConfig(BaseConfig): CfgProp('preferred-entry-point', 'entry-point', 'pref_entr= y_point', None, True)] if not os.path.isfile(self.filename): raise EdkrepoGlobalConfigNotFoundException(humble.GLOBAL_CFG_N= OT_FOUND.format(self.filename)) - super().__init__(self.filename, True) + super().__init__(self.filename,=20 + get_edkrepo_global_data_directory(), True) =20 @property def preferred_entry(self): @@ -165,7 +165,7 @@ class GlobalConfig(BaseConfig): @property def manifest_repo_abs_local_path(self): """Provides an absolute path to the manifest repo based on configu= ration file values.""" - return os.path.join(self.edkrepo_global_data_directory, self.manif= est_repo_local_path) + return os.path.join(self.global_data_dir,=20 + self.manifest_repo_local_path) =20 @property def sparsecheckout_data(self): @@ -192,7 +192,7 @@ class GlobalUserConfig(BaseConfig): CfgProp('scm', 'mirror_geo', 'geo', 'none', False), CfgProp('send-review', 'max-patch-set', 'max_patch_set', '10',= False) ] - super().__init__(self.filename, False) + super().__init__(self.filename,=20 + get_edkrepo_global_data_directory(), False) =20 @property def max_patch_set_int(self): -- 2.16.2.windows.1