From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web11.1479.1591739569579152126 for ; Tue, 09 Jun 2020 14:52:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=uA5vdFmC; spf=pass (domain: intel.com, ip: 134.134.136.20, mailfrom: ashley.e.desimone@intel.com) IronPort-SDR: DLVx/XofiDwZMGA4q3RVciG5wHeTqZEo1pdaocRvTbpTs2W3mQHOzNwHvy6sizyilk58WK4Nly T0YREFHri6ww== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jun 2020 14:52:48 -0700 IronPort-SDR: OgwUOqZ+jLHcfIF+OuU7Qrc1A+3BnJFFzX5c8ToYhMKB9u71CSgLKOImcfWuvEOeCqCdlxIWXr by11XY+tYrUg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,493,1583222400"; d="scan'208";a="288974330" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga002.jf.intel.com with ESMTP; 09 Jun 2020 14:52:48 -0700 Received: from fmsmsx113.amr.corp.intel.com (10.18.116.7) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 9 Jun 2020 14:52:48 -0700 Received: from FMSEDG001.ED.cps.intel.com (10.1.192.133) by FMSMSX113.amr.corp.intel.com (10.18.116.7) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 9 Jun 2020 14:52:47 -0700 Received: from NAM04-SN1-obe.outbound.protection.outlook.com (104.47.44.56) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 9 Jun 2020 14:52:48 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MoXikuN5P7Am9JGtimJs7BgnS3fxopjcy6uI5ALS+cTCcxy5KuuY+gCn5tXz3gARFFjPXB8YA5eTFO9W3eEdDdVpynSZ2ivVUmENIU9oX8qWcdOL25OoXh/Y2L5vEOtksNBUHlsAMdY0umtvXwlRDtvCLYMMqb5vfiFa8SisDc4ZO9+ETwSWCpnhWVBOBY5q54WxjbpedT+ehnutn6rQs94cVMv3Exhim0KKqBFvZhtm5E29OoKeiBK852hbYrrpEbWier2G7PCx6xm7lDGm5T/31NhyFhTDIWVBLfYQ3r8JBE8pi24Qj3hJh+rh+HSzHl8IBCazToCUzLuLjWYBOA== 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=XVSCGeN2Yo+TkwEMEyKVsSxxUj6Q8paTVAandElhC5k=; b=lhFX7GXN8ANsEqusOdh95zgV0L2riZzyH4wEgfifo7ucn4RIk+i/NSSuSydMw983AVrN/APOUPaVjCywOzp190JD2BCiSCRE1lYWDQl0D7pMbMns2NwDe42L/OMTEv5HKVVFSakcEQA6OKtXIpoVQcFaNppjGJ6HDI5y25RVick/rBSVevft2I8DM3SEqpIXGkOK2IYCqyI2VY0LODUOZsy5gecE54jyrBtNl887boeP1T77vJIBPKyEAsHC7W1o1/MKqn05LsP9npVeleSaVcgGS9vFcTMFFtS5LpTddki4NXLRlQ1L14UY7uNWNgCQE/lnFZNEhs6IqSrZz5K6iA== 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=XVSCGeN2Yo+TkwEMEyKVsSxxUj6Q8paTVAandElhC5k=; b=uA5vdFmChiKlTWyJMJEEd1E9u3p9r8hZRY7nGajQ+aWT/fKLinXcxqsjJCfNwdts1WnHBRKDSpkJM4jskAVuT+/30Tt+rBg2Bry3FsKW/WGeNZTRLBjhrAgrVm3eRWEvZ7a+1MjytRpnaXAJqdz6k23lGooK2V8Won3VIk2RdAc= Received: from BY5PR11MB3973.namprd11.prod.outlook.com (2603:10b6:a03:185::29) by BY5PR11MB4371.namprd11.prod.outlook.com (2603:10b6:a03:1bf::13) 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:52:46 +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:52:46 +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: Fix argument checks in manifest-repos Thread-Topic: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Fix argument checks in manifest-repos Thread-Index: AQHWPfN8N/V6go4aU0+50dKVEHWnOajQ0/SQ Date: Tue, 9 Jun 2020 21:52:46 +0000 Message-ID: References: <20200609001758.2538-1-nathaniel.l.desimone@intel.com> In-Reply-To: <20200609001758.2538-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: 2030026b-a099-4bc9-9935-08d80cbf7228 x-ms-traffictypediagnostic: BY5PR11MB4371: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:7219; x-forefront-prvs: 042957ACD7 x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: HOAW7yTtR0Lzkgx/LDCjERkusksjwTIRAN3TIwVNk3A7oHtVc1pM8vQhvOw5ilkUzcMklAY7mQvbtC/Td7RMX/1BMk4dD47QgqzE4ty0VUVW9uClmOKB226S6k2j/NpZoRr7b4p51zvcMvKMr/7TYY5GncunC3y69K4uaCEPO0tPF71AKL3/Aqp9XWr2z2p5RXqaWAeIBmvjmNhm14zcMQ8uIFylMgbpsUu00mgAjlCp6xM5kDFUcA80+ACDrNu7++A5pKURYh17IV8gAEKUJM7uEQJ4UUP1zWI4MmjBxaTL04xo56pfs0AdhmtDnfvtepPI51iwCjKfzrNfVZ6naA== 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:(396003)(346002)(39860400002)(136003)(376002)(366004)(53546011)(55016002)(83380400001)(7696005)(71200400001)(4326008)(86362001)(5660300002)(9686003)(186003)(107886003)(33656002)(8936002)(110136005)(52536014)(8676002)(26005)(6506007)(316002)(66946007)(54906003)(2906002)(478600001)(64756008)(66476007)(66446008)(76116006)(66556008);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: vHff4skGBtR+NSIRR+EF3AFQyChie5KgNdiQTA1lJAPZUPjHCJoIuNbdJMERfHBksqs5IT1GAR27HJVsEIkRHzD7k1gucuEnRf42r+bdX+If6hpqEYxU0LVGiDK9MIajLiz39yvEIDLSvneiDSSaPjxhxsX6ZHClJtjcJaB9fjbVtzjo+qX0yKze3mKmsH7kEom6cRycz7EdOqXrPS3pBx+asuZw7ocyLN9IdzuNH/ADFCTtvzHzR6wDaiWeekpxEJfgrrXsWB2p1xVlXqwZHcSCUNEcusHPvHtte9T063QkM/6haOiRaqdpRYt1I/Gzh2j0ELl5haZtBpH30x/m/0jz9fSz4E6V8JiJUgf6zGgn+sQYAPbT6tz19E2DdGnRu/XcNp8EuPuAgKUSnty0AlTQ0IfPp4hG7evkkOXFuJ5Orj7dsnF0cAmfxTZ0WYgoXp2WCQxuxjxr1QE5iCjIBzwhW5Z7xnqMtVGYCmIbT8I93bHal5XiN6U1GzYM4ngw MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 2030026b-a099-4bc9-9935-08d80cbf7228 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Jun 2020 21:52:46.4186 (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: Nz5r1KpKCHAs5gIvvBThYjNW5JAtetChfXaYag3SIkuRluPV6Ab4C3Bm3BEFce/fQXKkFn/i140R/lmdHB/vLm53CoKCa2CL39aRr0VAMbg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR11MB4371 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 5:18 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: Fix argument checks in man= ifest-repos Fixed a logic bug in the argument checking for the manifest-repos command. Signed-off-by: Nate DeSimone Cc: Ashley E Desimone Cc: Puja Pandya Cc: Bret Barkelew Cc: Prince Agyeman Cc: Erik Bjorge --- edkrepo/commands/humble/manifest_repos_humble.py | 2 +- edkrepo/commands/manifest_repos_command.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/edkrepo/commands/humble/manifest_repos_humble.py b/edkrepo/com= mands/humble/manifest_repos_humble.py index 7dc8bfe..4a886a4 100644 --- a/edkrepo/commands/humble/manifest_repos_humble.py +++ b/edkrepo/commands/humble/manifest_repos_humble.py @@ -14,7 +14,7 @@ Contains user visible strings printed by the manifest_rep= os command. CFG_LIST_ENTRY =3D 'Config File: edkrepo.cfg Manifest Repository Name: {}' USER_CFG_LIST_ENTRY =3D 'Config File: edkrepo_user.cfg Manifest Repository= Name: {}' NAME_REQUIRED =3D 'The "name" argument is required to add/remove a manifes= t repository' -ADD_REQUIRED =3D 'The "name", "url", "branch" and "local-path" arguments a= re required to add a manifest repository' +ADD_REQUIRED =3D 'The "name", "url", "branch" and "path" arguments are req= uired to add a manifest repository' CANNOT_REMOVE_CFG =3D 'Manifest repositories cannot be removed from the ed= krepo.cfg file.' REMOVE_NOT_EXIST =3D 'The selected manifest repository does note exist in = the edkrepo_user.cfg file.' ALREADY_EXISTS =3D 'A manifest repository already exists with name: {}' diff --git a/edkrepo/commands/manifest_repos_command.py b/edkrepo/commands/= manifest_repos_command.py index b817662..af79f19 100644 --- a/edkrepo/commands/manifest_repos_command.py +++ b/edkrepo/commands/manifest_repos_command.py @@ -80,7 +80,7 @@ class ManifestRepos(EdkrepoCommand): =20 elif (args.action =3D=3D ('add' or 'remove')) and not args.name: raise EdkrepoInvalidParametersException(humble.NAME_REQUIRED) - elif args.action =3D=3D 'add' and not (args.branch or args.url or = args.local_path): + elif args.action =3D=3D 'add' and (not args.branch or not args.url= or not args.path): raise EdkrepoInvalidParametersException(humble.ADD_REQUIRED) elif args.action =3D=3D 'remove' and args.name and args.name in cf= g_repos: raise EdkrepoInvalidParametersException(humble.CANNOT_REMOVE_C= FG) -- 2.26.2.windows.1