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.web12.4591.1591662693794118401 for ; Mon, 08 Jun 2020 17:31:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=sAsAk5We; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: erik.c.bjorge@intel.com) IronPort-SDR: Uup+10yVAAuwNn4dZMyghFed9pPAjuzbFiHEPKKwI4Sykgks5WcZ5bWVlwsCcGQoKgFuwOAQ4K UB8kKyvDzvFQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jun 2020 17:31:32 -0700 IronPort-SDR: rr9Ekh5X84xmBNwZgD2clS59L9Fsk0TQg6NhZXhEVFcD6g7hwQN2uYJi2uOG08uxsorHNa/9p0 tuF5ReoinRmw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,489,1583222400"; d="scan'208";a="306105739" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga008.jf.intel.com with ESMTP; 08 Jun 2020 17:31:31 -0700 Received: from fmsmsx120.amr.corp.intel.com (10.18.124.208) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 8 Jun 2020 17:31:31 -0700 Received: from FMSEDG001.ED.cps.intel.com (10.1.192.133) by fmsmsx120.amr.corp.intel.com (10.18.124.208) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 8 Jun 2020 17:31:31 -0700 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (104.47.58.168) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 8 Jun 2020 17:31:31 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NRIq9mUq2LYTBOEgeOUyQgmqVkHeJ/n7L5kdDIQEpFiTBcgVC23pxbztGENt+2exLTs+mnUpC6IHSBUFNVf4Hmrvle14DdGZotHee2wj3vaQDC8pW2WqwUaUujTqpPgTbh29Bl7islsSYnkTHoS1jgYdNHXB9xOCGzrwGcDtJmBFtosVlLPvdSjDD6mnD/5OV9u7zfBSJSM6vPGc0f6Z70bz0O2BaVJ6nvqsH2X44ynsZJz6j6mj3E6vG42m7qORuVD93W6W23gVA8caE2cC7qkSpXoTUk2UAed20XCa8AqMsE7qfjz1jmdjEeRXhDlCA3/7uQBG6wPWvmnWWT356g== 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=+YAXAAzS8RuN0a5XXy8Dtaapxel3P4CUSRI0Lz9oGJI=; b=NgrhEOu445yL2D43gSRE9r2veVs+PRBN+q6BiFLgg5o/Qy3RwcOXNTOtTFDAAir3LQ7BtR3UnNcPcTLRp+DlO1pfl6z7STHOTZKmsHwFlNbgUOyGCcM22RY7u/5UwqEUKxSUaGPEqjKlBbCS3i/A4cppjECar7lJSDNcccYnhLIsK8B4dUVOKzJJvyySLWeAbjgh/45A6cA2hq1aqo3S5cthl8hb3/GjAdnE870rB+M/YxpaY06Qd2ZaHKUFJfgb0J2E7lE47U+abhtCNiZWRhg4qCKisTcdXaeW5VqTvl0ccZFcZRrq3k7VomewjgxkNLP46+scEaeqI2RESNsLJQ== 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=+YAXAAzS8RuN0a5XXy8Dtaapxel3P4CUSRI0Lz9oGJI=; b=sAsAk5We/KJpPTqDFe4F5mku/auvJrVGpmATZoPGBIqk8PvfrrzkXIZn4fw8eKDpP5Hlra4BaBKyHh/FGTqkwP6u+d5uL2P+sXIE7LHljjOEKaUd1DEvdfR8Y4/Oa8Zie8llI322egvRrB9ze+YGmK/ESiEl3mKmXhXDbxtte6Y= Received: from MW3PR11MB4554.namprd11.prod.outlook.com (2603:10b6:303:5d::7) by MW3PR11MB4585.namprd11.prod.outlook.com (2603:10b6:303:52::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3066.20; Tue, 9 Jun 2020 00:31:30 +0000 Received: from MW3PR11MB4554.namprd11.prod.outlook.com ([fe80::c569:9903:4c10:9281]) by MW3PR11MB4554.namprd11.prod.outlook.com ([fe80::c569:9903:4c10:9281%4]) with mapi id 15.20.3066.023; Tue, 9 Jun 2020 00:31:29 +0000 From: "Bjorge, Erik C" To: "Desimone, Nathaniel L" , "devel@edk2.groups.io" CC: "Desimone, Ashley E" , "Pandya, Puja" , Bret Barkelew , "Agyeman, Prince" 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: AQHWPfN8gGeJA5aNukyYUODBOYunXKjPbrDQ Date: Tue, 9 Jun 2020 00:31:29 +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-reaction: no-action dlp-version: 11.2.0.6 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: [134.134.136.206] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 2661a36b-2961-4859-9abf-08d80c0c7419 x-ms-traffictypediagnostic: MW3PR11MB4585: 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: 4Fo/JnY+1KFXK7QZA3cET8Rpf9B+Ri3ZDTnvPCMzm/wWhuUz9Tr8csz2AnOhsoTAFt+238lKl0qF9fxQrAKEjaSUDc6dVwvT9Q+jvxyq1GFzQdoMVotNFB/JQsqg2EmXITPtUqA2YGo9K+sA2rkbtrtXJEX79TTjGa3zXTa8MGqyzEUtH0TezHTFRONQihPXS95jaOwXI6qiwIp62UsuZ3kx1UdoKMJhC/1NK1yXqwZLrCj3pyiN1pAhg6sUc0UA8b1AjAtWRN3k+6EDHvFV2jXcU1FsSZSTJ1WivAPB6vT319Eu7jZcDzbmH9sTlUia+u+uYc+2Qh2xcpV3vug5Pg== 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:(39860400002)(396003)(346002)(376002)(366004)(136003)(478600001)(52536014)(6506007)(2906002)(66946007)(53546011)(66476007)(86362001)(76116006)(66556008)(316002)(186003)(71200400001)(26005)(66446008)(5660300002)(7696005)(64756008)(55016002)(110136005)(54906003)(4326008)(33656002)(8676002)(9686003)(8936002)(83380400001)(107886003);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: CmFO5UH+MNPcgMgfOFmjfQiKExRpJKDb9cm/F8QCA5wmXE7VHRCHPkt0EaHSgCcDHb6HnXTsNV1k0/af0wS97mN1MtYB4w4a46kTLLYRPXA2mwnuvznBRKEMejHyrMtB0SH23cuht6Bv8rYHP2A9s7HCb2CICByVpFfpPgJactXlcbkjBMhTfq5cr3yulx71YDTYKbe6JraU7lm+5+njC33GMycrRFJPR5KbfymCbFkUan79MlkTiuWpBLaTwZnc01F/qykOcSyRZ7YfcmGYsrLOfaokXr6t752rGJLnLBzEiy6BfQQhdZGubh4U1/rh2mN4+NhSARKrcX8vQFEAyZkblomNrji9/9Au5EFt6Aie1w40AcAjffJpA38cuVlx6/zVurgq0oMGEYnFhAj0TC/a1NjGpuWller0WcRNTbwqjnA2oXS/b/d61lFT2uIyFF+2qAgTkBBNQGQLru5GTgWqLoBkQGjPSTz+8Pg58OQqv9MartF0m8tROlI+KFTd MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 2661a36b-2961-4859-9abf-08d80c0c7419 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Jun 2020 00:31:29.9124 (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: 8rakEBVskk+vgZ0cpQHV8mGZC2V6cghfuSfzFkmh5ZqaLe/1nuNdCzu/8jz548Fnjh3Zg3/gMPjXduUQzjEWOw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR11MB4585 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, 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