From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web12.1489.1591739791369477547 for ; Tue, 09 Jun 2020 14:56:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=WPGyOphS; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: ashley.e.desimone@intel.com) IronPort-SDR: 0USoDw/jwRM0Uveoiu3s0SMF1HUHVwtiU0Q57CJYwkWdxWd31QEwXFc9ar+YJVhGiJ6kl/l8h0 ykgVA4/OjrcA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jun 2020 14:56:30 -0700 IronPort-SDR: gu5tl/pjGmr8E4bW8k07FjiX4IEq9F/WXDHZvCSHXF9NXEet+nVI8v1UokCdLadTvFROLE7RER lacAy6pzv9CQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,493,1583222400"; d="scan'208";a="447272755" Received: from orsmsx110.amr.corp.intel.com ([10.22.240.8]) by orsmga005.jf.intel.com with ESMTP; 09 Jun 2020 14:56:30 -0700 Received: from orsmsx605.amr.corp.intel.com (10.22.229.18) by ORSMSX110.amr.corp.intel.com (10.22.240.8) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 9 Jun 2020 14:56:30 -0700 Received: from orsmsx601.amr.corp.intel.com (10.22.229.14) by ORSMSX605.amr.corp.intel.com (10.22.229.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Tue, 9 Jun 2020 14:56:30 -0700 Received: from ORSEDG002.ED.cps.intel.com (10.7.248.5) by orsmsx601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Tue, 9 Jun 2020 14:56:30 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.171) by edgegateway.intel.com (134.134.137.101) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 9 Jun 2020 14:56:29 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XeNumJAyHsE5XgyR1OYw7y1dmyUQBHMAO1mLqRQCw6AEQqVR9SG9EMUAqOI16Ueazm4JUoEpF2UQ3m36a9usHANm9SZHh3RFI7RoMB76lYHWGFTmszF9JPs4U2mXVhFFXAzeVntDP6LcboanKDG5rIVltjbbDWLl8bIYNPKNGnYt43EnMiGGJDcPW8e8Z4D4C0b8CrdVSk84ceA1IY2FiFq533rFeQpVbhfrINCHTDL0U2ISV5Fh/m+yHI126EthVYVi55Os+y+YXRHoxUE1KrkbrkUvGpdLczeZie0amPldl6/nghQWSEGWNHWwKnQehs3qKNsT8PHgvCep8wFVYA== 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=wwYF9BNPdp58q4GaIdkxMG41cYH7B70xbpqhJTn9+iM=; b=ja+B/NrFXsyKI0VkINoWOUJkS10dhobF3rl8UH2cXGGKXnfneOiIi70oqvgLiFzXKyNMN4/HyuWLA5N44c4BKBbXErbPTNaq2vvS1GhIoWxmEhKmPPXLzx58NT/g5zYeeNoNJo0PH4uu3amaMABtJ4Ang4UYHILCN/ufcNFnhxmh7MUIOs3c4kZ9aDGapTELr+l08vFt9e9rhPXhX979mvadql1bbfWl8MOWPlhICVaMX+rhOPk7PdKnfq//jG50XOcRMMU2eXXwOUFZIKZnfuh81+sQJYxecJaIq5G29EKWzxtUElGndsh0YZ8rtifIftbFC+zixLZLSaoDXyxl7g== 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=wwYF9BNPdp58q4GaIdkxMG41cYH7B70xbpqhJTn9+iM=; b=WPGyOphSkTOyIvcg9djjlQLmqhjxMXJ4OzXPvgZLOdyFUWFuxHGtfjI0TY5KDeTijD838JKNb9upRoxoOaTz4uO5pKLcMtrk6Bgd7vXt/n6LzkSyXDBsO/KjJe+ZDFHtR6W6hYEMqZPK/twGn6OKfV9cKbrFB+JEAOqlMgM0jhs= Received: from BY5PR11MB3973.namprd11.prod.outlook.com (2603:10b6:a03:185::29) by BY5PR11MB4088.namprd11.prod.outlook.com (2603:10b6:a03:185::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3066.18; Tue, 9 Jun 2020 21:56:28 +0000 Received: from BY5PR11MB3973.namprd11.prod.outlook.com ([fe80::296a:eb1c:2b52:2904]) by BY5PR11MB3973.namprd11.prod.outlook.com ([fe80::296a:eb1c:2b52:2904%7]) with mapi id 15.20.3066.023; Tue, 9 Jun 2020 21:56:28 +0000 From: "Ashley E Desimone" To: "Desimone, Nathaniel L" , "devel@edk2.groups.io" CC: "Pandya, Puja" , Bret Barkelew , "Agyeman, Prince" , "Bjorge, Erik C" Subject: Re: [edk2-staging/EdkRepo] [PATCH] EdkRepo: check for manifest-repos section in edkrepo_user.cfg Thread-Topic: [edk2-staging/EdkRepo] [PATCH] EdkRepo: check for manifest-repos section in edkrepo_user.cfg Thread-Index: AQHWPd8ne4UMV+kxCU25i2hpd65Un6jQ1eGw Date: Tue, 9 Jun 2020 21:56:27 +0000 Message-ID: References: <20200608215214.2296-1-nathaniel.l.desimone@intel.com> In-Reply-To: <20200608215214.2296-1-nathaniel.l.desimone@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.2.0.6 dlp-reaction: no-action dlp-product: dlpe-windows 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.220] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 6ebb74ae-45f6-46a9-334b-08d80cbff634 x-ms-traffictypediagnostic: BY5PR11MB4088: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:6430; x-forefront-prvs: 042957ACD7 x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: yZlCVNRkm19QL7V3Gixqbd7a8cp5ELMQr1ZHwM6xIigZ5KRMPLwPs/erj/0JjHtnODTvoDzCHwxKt6lYkYLYq7IiAPvsjhEvuu9YI+EL/a8NuJ5xNFZxRX2nRMwYPlnrqqQwe9NO29yKW/aQjSkHksw4zGlg5EsQkc/yF1QROEcVwZTkILOY45jyYeKWYpJDZEwy5aujZofvnRUdXcWnKr9+Fv9rtMXb2ImFljwhx3O7a9hIIvGGNt6dhkTyAJmYw5sr4zBEp5w3uJsYtG40V0nazaQ+66iSJLACgRbHWuziAscUbsl9ifW2Exk51XcS3/U6c8UhoEN31V2dQSq+5w== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR11MB3973.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(376002)(346002)(136003)(396003)(39860400002)(366004)(71200400001)(316002)(33656002)(110136005)(83380400001)(54906003)(2906002)(107886003)(7696005)(478600001)(66446008)(66946007)(5660300002)(55016002)(8936002)(52536014)(4326008)(66556008)(9686003)(86362001)(26005)(8676002)(76116006)(6506007)(66476007)(53546011)(64756008)(186003);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: jnUPopBJBOpXD8tLA7SjqmD5wdJCrHsmgUFfTJBTSoxnEpVIy92Og7vrT4xR1RTH9HwJdt3tQKnPXFHhkmLbsXuQ6efiNIXSg0n82mtNE28v+E210Qj5rmpUpxiD8TPvr4TZMuINs+EXBCq6AucHkg2ACjYITIJoldpg/kva71tvWwFElB3iVkreZ4qDVAvs/rP1JuRowsOlTa43lp+G5VDTVE+/YPnWIuMW0MuhvrlpqxKmigz2asbxoHbXtB/dsczS6YR03IhOgdQqgSJ4ls+KuunWlnSZ5qeYsCSn7xM3LizSEGn5oWzR4Ah3FyEbEJK1tWtRpq9QEAQgh0ND825ln9V6Rt2XLCDQzOfLa1lDpn0yPKSIirxdBqj5DYeyAZs+o6XjeEISWg7LTkTocB6TDBdEwkbDG0gYcqal/DBPDcHlXnBKZB2i/dWdxEUkNlCMncjHwT+n7VFGsKdQAePA32Rl2q8ka8sw9mYN2LI4CkQry5VCCWvhixcd+s5s MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 6ebb74ae-45f6-46a9-334b-08d80cbff634 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Jun 2020 21:56:27.9929 (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: 8lDAgF1510VqnVq4ZdGPJLlp+9YpCoKYugTlMgx9i+WB8/nR0KUOqcEvQnY8uip1GYoBBOE4pU9Ug1VkYfklv0IUqXjez5j4jBRfZQcWLF0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR11MB4088 Return-Path: ashley.e.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: Ashley DeSimone -----Original Message----- From: Desimone, Nathaniel L =20 Sent: Monday, June 8, 2020 2:52 PM To: devel@edk2.groups.io Cc: Desimone, Ashley E ; Pandya, Puja ; Bret Barkelew ; Agyeman, Prin= ce ; Bjorge, Erik C Subject: [edk2-staging/EdkRepo] [PATCH] EdkRepo: check for manifest-repos s= ection in edkrepo_user.cfg The manifest-repos command currently does not check for the existance of th= e 'manifest-repos' section in the edkrepo_user.cfg file. This change adds t= he check. Signed-off-by: Nate DeSimone Cc: Ashley E Desimone Cc: Nate DeSimone Cc: Puja Pandya Cc: Bret Barkelew Cc: Prince Agyeman Cc: Erik Bjorge --- edkrepo/commands/manifest_repos_command.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/edkrepo/commands/manifest_repos_command.py b/edkrepo/commands/= manifest_repos_command.py index b817662..3dbe604 100644 --- a/edkrepo/commands/manifest_repos_command.py +++ b/edkrepo/commands/manifest_repos_command.py @@ -95,13 +95,24 @@ class ManifestRepos(EdkrepoCommand): user_cfg_file =3D configparser.ConfigParser(allow_no_value=3DT= rue) user_cfg_file.read(user_cfg_file_path) if args.action =3D=3D 'add': + if not user_cfg_file.has_section('manifest-repos'): + user_cfg_file.add_section('manifest-repos') user_cfg_file.set('manifest-repos', args.name, None) user_cfg_file.add_section(args.name) user_cfg_file.set(args.name, 'URL', args.url) user_cfg_file.set(args.name, 'Branch', args.branch) user_cfg_file.set(args.name, 'LocalPath', args.path) if args.action =3D=3D 'remove': - user_cfg_file.remove_option('manifest-repos', args.name) - user_cfg_file.remove_section(args.name) + if user_cfg_file.has_section('manifest-repos'): + if user_cfg_file.has_option('manifest-repos', args.nam= e): + user_cfg_file.remove_option('manifest-repos', args= .name) + else: + raise EdkrepoInvalidParametersException(humble.REM= OVE_NOT_EXIST) + else: + raise EdkrepoInvalidParametersException(humble.REMOVE_= NOT_EXIST) + if user_cfg_file.has_section(args.name): + user_cfg_file.remove_section(args.name) + else: + raise=20 + EdkrepoInvalidParametersException(humble.REMOVE_NOT_EXIST) with open(user_cfg_file_path, 'w') as cfg_stream: user_cfg_file.write(cfg_stream) -- 2.26.2.windows.1