From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web11.3217.1587136803088617189 for ; Fri, 17 Apr 2020 08:20:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=ROVDSNQa; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: erik.c.bjorge@intel.com) IronPort-SDR: yavWABu8v/8oUWyM5rawpsSUlIoJJumZv0qNy/yE+5vc363QUUgx2EDca7WSpJaW/vXRgmlODf Zulz/MU+nADA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Apr 2020 08:20:02 -0700 IronPort-SDR: 3x1thKN3DdEhwqpUR8BoPtentIy5O1J8sUS3xcVIwgtwZgJv1ItZpOlrSxV+mJj5CxQEfL6+nX Yshx3juB2LDQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,395,1580803200"; d="scan'208";a="455662985" Received: from orsmsx108.amr.corp.intel.com ([10.22.240.6]) by fmsmga006.fm.intel.com with ESMTP; 17 Apr 2020 08:20:01 -0700 Received: from orsmsx601.amr.corp.intel.com (10.22.229.14) by ORSMSX108.amr.corp.intel.com (10.22.240.6) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 17 Apr 2020 08:20:01 -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 08:20:00 -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 08:20:00 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.36.53) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 17 Apr 2020 08:20:00 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NFlH2tgLApKcKamtyzQWtGAMgqi7LHmI+MQI0bulvW4B1IC81MZzVYOp0IRmMnPhvQeSnB0RIa/9R/tMdwb8exxoqJYzlSLLrxNksZOK1Qz1UON6uNU6BieWMLE1X7U6uDziiUoCB/w3tU8Z1WdCJtv724kgp+1NAzm7vG4kqRL3g3GTtvtbQcJ2KxrgdR/HOXu2qUQwr8tmjKhKFz3TTSK2rARgr+7Y3lyfxjHWAdF5WXEBa5MOsRZKws3p5vMFC8k9tCG+f2XRZ/G3ldlFLeEg+QANbT9cXaogzLJwH/rn0oHsDxcbEo965RG1fjfUbV54BrKvlv8PBADplw3PWg== 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=7AC0Fqu7Q7ddxRLuUHZrGtlURbQc4B4a/YbDv6WjbrE=; b=CeDCMKyuOs8rFm0RxvWvJ7i1QH/UXhMRyalOePnpNQqBjOhqj+mYNoRQWmpstg+iCA9GYr6KpFaqZ7rHO5KDv1URhDbSYhZaX/rpLfuy6mvcf8l11Vnupf3gcXrI8VP/BcSeK/t+EGp1KAhLxo611lpXZwJT0On+GaEdW7djNZM4pI/tav1X3DWa+VdezBOS2Ltk+X4Q/JZLs2TLh/X2ef7x5GpmIkN2JEI9lXgCNdcFkTS8DO2vqZ2qS6wJv12U2n7PspQc8fSz+7CUNPtYaIMcynVpOGchZkLkgx4FPmdjwmmcd8f6jFnLmuyoZxalpStu6NtQyQ6pNJaXac5y4g== 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=7AC0Fqu7Q7ddxRLuUHZrGtlURbQc4B4a/YbDv6WjbrE=; b=ROVDSNQaN4bS+1/LdOsQWSRhhNBDp3xLiZnFMYrnUxk8EuKC5GsnarBqlsvEVvRd8lUBkVc2xFKZg61oLBakfMT8gceyTsZhNlXQ4B+iblHTIm2IhJGyFwWt5k16ePzDyj6V9SVsOQN6VnwQ2TUVIhqQ39JoULC/aDApa3ZRewM= Received: from MW3PR11MB4554.namprd11.prod.outlook.com (2603:10b6:303:5d::7) by MW3PR11MB4650.namprd11.prod.outlook.com (2603:10b6:303:54::18) 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 15:19:58 +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 15:19:58 +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 5/6] EdkRepo: Move edkrepo_global_data directory to BaseConfig Thread-Topic: [edk2-staging/EdkRepo] [PATCH 5/6] EdkRepo: Move edkrepo_global_data directory to BaseConfig Thread-Index: AQHWFGi89BsZY5bGV06ajtE5KWR6Cah9bm8g Date: Fri, 17 Apr 2020 15:19:58 +0000 Message-ID: References: <20200417033123.34972-1-ashley.e.desimone@intel.com> <20200417033123.34972-6-ashley.e.desimone@intel.com> In-Reply-To: <20200417033123.34972-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: 346a58b5-c85c-403e-02b0-08d7e2e2ca9c x-ms-traffictypediagnostic: MW3PR11MB4650: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:7219; 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)(366004)(71200400001)(5660300002)(4326008)(8936002)(498600001)(86362001)(7696005)(33656002)(107886003)(66476007)(66556008)(66946007)(53546011)(6506007)(55016002)(54906003)(64756008)(2906002)(76116006)(9686003)(110136005)(66446008)(52536014)(81156014)(26005)(8676002)(186003);DIR:OUT;SFP:1102; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 8jOD8wUV38cxX9M5L6J0IjiDlD5Me79H4OwwQay2xsPVLCcpQky7EDApmiakbYUOybysiVxHGAxzbOUtOTdAuuljsFBTl439ZeQBSUCbOKJ2koBkSLqDSSfEHXjSqcgmdv4pVzVUtjkGXh2WEJpzo+p+GF9aNg9qQPM05P0CKXOUthGggo0F4sFhbK/Ss6yUAGsT5HNHt5fVRc6PIbowky0bbrOcVAWCRgXaapm+yAER0tCtWiuT4yODM2cpiCOa+4LcdZxrW9ny6ca1kKmBK1jTGQXXaaavn7xBKXatoc9D8t6DZqxaL9uaW2Lb5N6So+T87vrNuykXcehnR47vWN+9USwAZWCuXc9sGmD2paBCjK1No/Zaw8UVbRIS55ntZ6/FBzapHXbHC6JuLn60ZLfquZfKyMP93CE5eUcAaPU3INbkOmqrNM817SSHZpFD x-ms-exchange-antispam-messagedata: Z33xQa9UfNLC+yXXS9IeNm10esM5i42Z+imLKwWQE0PEFH4n5OVYZ3qoN1D3zNHlUt+tpKjUdlXJ8hMDQ4KfkldTHQKoPbcseGmACXGiWVinTxYhYWFc9KslD6YpVCdF0KMdnlMbAl4ZAQ0Ijsmcug== MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 346a58b5-c85c-403e-02b0-08d7e2e2ca9c X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Apr 2020 15:19:58.4757 (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: VbAmgeBI3kFJ4CHsbuXdoednEP6Zv0xYhQaI0DJeQYDDHQtQq7ejI+ZpSpY3AidFCH7OHrj0rQD3SSLc/EC79g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR11MB4650 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: Thursday, April 16, 2020 8:31 PM To: devel@edk2.groups.io Cc: Desimone, Nathaniel L ; Pandya, Puja ; Bjorge, Erik C ; Bret Barke= lew ; Agyeman, Prince Subject: [edk2-staging/EdkRepo] [PATCH 5/6] EdkRepo: Move edkrepo_global_da= ta 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 e053f8b..a4daba3 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) @@ -136,8 +137,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), @@ -152,7 +152,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): @@ -169,7 +169,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): @@ -196,7 +196,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