From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4BADE1389E2 for ; Tue, 9 Dec 2014 18:30:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 16FF5E0B59; Tue, 9 Dec 2014 18:30:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1B096E0996 for ; Tue, 9 Dec 2014 18:30:49 +0000 (UTC) Received: from pomiot.lan (77-253-147-61.adsl.inetia.pl [77.253.147.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id 929943405B1; Tue, 9 Dec 2014 18:30:47 +0000 (UTC) Date: Tue, 9 Dec 2014 19:30:34 +0100 From: =?UTF-8?B?TWljaGHFgiBHw7Nybnk=?= To: Subject: Re: [gentoo-dev] metadata.xml un-ization, v2 Message-ID: <20141209193034.61b986a1@pomiot.lan> In-Reply-To: <20141209101509.1d13201c@pomiot.lan> References: <20141209004628.4de52564@pomiot.lan> <20141209101509.1d13201c@pomiot.lan> Organization: Gentoo X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; x86_64-pc-linux-gnu) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/yfMe72+lwvURigXFS//b39Y"; protocol="application/pgp-signature" X-Archives-Salt: 7e502189-f81e-45d4-96a9-17a9e87c3357 X-Archives-Hash: ee6cbf771f63809a1f6258abde54db10 --Sig_/yfMe72+lwvURigXFS//b39Y Content-Type: multipart/mixed; boundary="MP_/PgZM6AVS=xkj0VSyNAtlF2S" --MP_/PgZM6AVS=xkj0VSyNAtlF2S Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Dnia 2014-12-09, o godz. 10:15:09 Micha=C5=82 G=C3=B3rny napisa=C5=82(a): > Dnia 2014-12-09, o godz. 00:46:28 > Micha=C5=82 G=C3=B3rny napisa=C5=82(a): >=20 > > Hello, all. > >=20 > > So considering the previous thread, the Council and QA discussions, I > > have prepared a new version of the metadata.xml update. To hopefully > > make everyone happy, I come with this three-step process: > >=20 > > 1. Add type=3D"" attribute to tag (see attached patch), > >=20 > > 2. Convert to , >=20 > If anyone cares, attaching my script doing the conversion. It tries > hard to preserve the indentation used in metadata.xml. However, it does > not preserve ' vs " in attribute names. >=20 > The diff can be seen @ > http://dev.gentoo.org/~mgorny/tmp/herds.diff.xz And a small update to the script attached, that avoids adding duplicate tags when herd's already in as well. Linked diff updated as well. --=20 Best regards, Micha=C5=82 G=C3=B3rny --MP_/PgZM6AVS=xkj0VSyNAtlF2S Content-Type: text/x-python Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=herdfix.py IyEvdXNyL2Jpbi9lbnYgcHl0aG9uDQoNCmZyb20gY29sbGVjdGlvbnMgaW1wb3J0IG5hbWVkdHVw bGUNCmltcG9ydCBlcnJubw0KaW1wb3J0IGdsb2INCmZyb20gbHhtbC5idWlsZGVyIGltcG9ydCBF DQppbXBvcnQgbHhtbC5ldHJlZQ0KaW1wb3J0IG9zDQppbXBvcnQgb3MucGF0aA0KDQpkZWYgbWFp bigpOg0KCWhlcmR0dXBsZSA9IG5hbWVkdHVwbGUoJ2hlcmR0dXBsZScsICgnZW1haWwnLCAnbmFt ZScpKQ0KCWhlcmRkYiA9IHt9DQoJcG9ydGRpciA9ICcvdmFyL2RiL3JlcG9zL2dlbnRvbycNCglo ZXJkc2ZpbGUgPSBvcy5wYXRoLmpvaW4ocG9ydGRpciwgJ21ldGFkYXRhL2hlcmRzLnhtbCcpDQoJ aGVyZHN4bWwgPSBseG1sLmV0cmVlLnBhcnNlKGhlcmRzZmlsZSkNCglmb3IgaCBpbiBoZXJkc3ht bC5nZXRyb290KCk6DQoJCWsgPSBoLmZpbmQoJ25hbWUnKS50ZXh0DQoJCWUgPSBoLmZpbmQoJ2Vt YWlsJykudGV4dA0KCQlkID0gaC5maW5kKCdkZXNjcmlwdGlvbicpLnRleHQNCgkJaGVyZGRiW2td ID0gaGVyZHR1cGxlKGUsIGQpDQoNCglpbnRyZWUgPSBwb3J0ZGlyDQoJb3V0dHJlZSA9ICcvdG1w LzEnDQoNCgkjIExBWklORVNTIQ0KCWZvciBmIGluIGdsb2IuZ2xvYihvcy5wYXRoLmpvaW4oaW50 cmVlLCAnKi8qL21ldGFkYXRhLnhtbCcpKToNCgkJc3VicGF0aCA9IG9zLnBhdGgucmVscGF0aChm LCBpbnRyZWUpDQoJCXByaW50KHN1YnBhdGgpDQoJCW91dGYgPSBvcy5wYXRoLmpvaW4ob3V0dHJl ZSwgc3VicGF0aCkNCg0KCQl4bWwgPSBseG1sLmV0cmVlLnBhcnNlKGYpDQoJCWhlcmRzID0geG1s LmdldHJvb3QoKS5maW5kYWxsKCdoZXJkJykNCgkJaWYgbm90IGhlcmRzOiAjIHlheSwgb25lIGZp bGUgbGVzcyB0byBjYXJlIGFib3V0DQoJCQljb250aW51ZQ0KCQlyID0geG1sLmdldHJvb3QoKQ0K CQltYWludHMgPSByLmZpbmRhbGwoJ21haW50YWluZXInKQ0KCQlpZiBtYWludHM6DQoJCQlpbnNl cnRwb2ludCA9IG1haW50c1stMV0NCgkJZWxzZToNCgkJCWluc2VydHBvaW50ID0gaGVyZHNbLTFd DQoNCgkJIyB0cnkgdG8gZ3Vlc3MgaW5kZW50YXRpb24NCgkJZGVmIGFsbF90ZXh0cyhub2RlKToN CgkJCWZpcnN0ID0gVHJ1ZQ0KCQkJZm9yIGUgaW4gbm9kZToNCgkJCQlpZiBmaXJzdDoNCgkJCQkJ eWllbGQgbm9kZS50ZXh0DQoJCQkJCWZpcnN0ID0gRmFsc2UNCgkJCQl5aWVsZCBlLnRhaWwNCgkJ ZGVmIGFsbF9pbmRlbnRzKG5vZGUpOg0KCQkJZm9yIHQgaW4gYWxsX3RleHRzKG5vZGUpOg0KCQkJ CWlmIHQgaXMgTm9uZToNCgkJCQkJeWllbGQgJycNCgkJCQkJcmV0dXJuDQoJCQkJc3BsID0gdC5z cGxpdCgnXG4nKQ0KCQkJCSMgZ28gdG8gbGFzdCBsaW5lIHdpdGhvdXQgdGV4dA0KCQkJCWZvciBs IGluIHNwbDoNCgkJCQkJaWYgbC5sc3RyaXAoJyBcdCcpICE9ICcnOg0KCQkJCQkJYnJlYWsNCgkJ CQkjIGdvIHRvIHRoZSBsYXN0IGxpbmUNCgkJCQl0ID0gbFs6bGVuKGwpIC0gbGVuKGwubHN0cmlw KCcgXHQnKSldDQoJCQkJeWllbGQgdA0KCQlkZWYgc3ViX2luZGVudHMobm9kZSk6DQoJCQlmb3Ig ZSBpbiBub2RlOg0KCQkJCWZvciB4IGluIGFsbF9pbmRlbnRzKGUpOg0KCQkJCQl5aWVsZCB4DQoN Cg0KCQkjIHNvbWUgcmFuZG9tIGRlZmF1bHRzDQoJCWluZGVudCA9ICdcdCcNCgkJdHJ5Og0KCQkJ aW5kZW50ID0gbWF4KGFsbF9pbmRlbnRzKHIpLCBrZXk9bGVuKQ0KCQlleGNlcHQgVmFsdWVFcnJv cjoNCgkJCXBhc3MNCg0KCQlpbm5lcl9pbmRlbnQgPSBpbmRlbnQqMiBpZiBpbmRlbnQgZWxzZSAn XHQnDQoJCXRyeToNCgkJCWlubmVyX2luZGVudCA9IG1heChzdWJfaW5kZW50cyhyKSwga2V5PWxl bikNCgkJZXhjZXB0IFZhbHVlRXJyb3I6DQoJCQlwYXNzDQoNCgkJIyBzdGFydCBhZGRpbmcgbmV3 IGhlcmRzIGFmdGVyIG1haW50YWluZXJzDQoJCWZvciBoIGluIGhlcmRzOg0KCQkJaGUgPSBoZXJk ZGJbaC50ZXh0LnN0cmlwKCldDQoNCgkJCSMgbG9vayBmb3IgZHVwbGljYXRlIDxoZXJkLz4gZW50 cmllcw0KCQkJZm9yIG0gaW4gbWFpbnRzOg0KCQkJCWlmIG0uZmluZCgnZW1haWwnKS50ZXh0LnN0 cmlwKCkgPT0gaGUuZW1haWw6DQoJCQkJCW0uc2V0KCd0eXBlJywgJ2hlcmQnKQ0KCQkJCQlyLnJl bW92ZShoKQ0KCQkJCQlicmVhaw0KCQkJZWxzZToNCgkJCQlhdHRycyA9IGRpY3QoaC5pdGVtcygp KQ0KCQkJCWF0dHJzWyd0eXBlJ10gPSAnaGVyZCcNCgkJCQlubSA9IEUubWFpbnRhaW5lcignXG4n LA0KCQkJCQlpbm5lcl9pbmRlbnQsIEUuZW1haWwoaGUuZW1haWwpLCAnXG4nLA0KCQkJCQlpbm5l cl9pbmRlbnQsIEUubmFtZShoZS5uYW1lKSwgJ1xuJywNCgkJCQkJaW5kZW50LA0KCQkJCQkqKmF0 dHJzDQoJCQkJKQ0KCQkJCW5leHRpbnNlcnQgPSBpbnNlcnRwb2ludC5nZXRuZXh0KCkNCgkJCQlu bS50YWlsID0gaW5zZXJ0cG9pbnQudGFpbA0KCQkJCWlmIG5leHRpbnNlcnQgaXMgbm90IE5vbmU6 DQoJCQkJCXIuaW5zZXJ0KHIuaW5kZXgobmV4dGluc2VydCksIG5tKQ0KCQkJCWVsc2U6DQoJCQkJ CSMgYXZvaWQgZXh0cmEgaW5kZW50DQoJCQkJCW5tLnRhaWwgPSAnXG4nDQoJCQkJCXIuYXBwZW5k KG5tKQ0KCQkJCWluc2VydHBvaW50ID0gbm0NCg0KCQkJCSMgbm93IHdlIGNhbiByZW1vdmUgaXQg c2FmZWx5DQoJCQkJci5yZW1vdmUoaCkNCg0KCQkJCSMgbm93IGZpeCBwcmUtaW5kZW50DQoJCQkJ cHJldiA9IG5tLmdldHByZXZpb3VzKCkNCgkJCQlpZiBwcmV2IGlzIG5vdCBOb25lOg0KCQkJCQlw cmV2LnRhaWwgPSAnXG4nICsgaW5kZW50DQoJCQkJZWxzZToNCgkJCQkJbm0uZ2V0cGFyZW50KCku dGV4dCA9ICdcbicgKyBpbmRlbnQNCg0KCQl0cnk6DQoJCQlvcy5tYWtlZGlycyhvcy5wYXRoLmRp cm5hbWUob3V0ZikpDQoJCWV4Y2VwdCBPU0Vycm9yIGFzIGU6DQoJCQlpZiBlLmVycm5vICE9IGVy cm5vLkVFWElTVDoNCgkJCQlyYWlzZQ0KCQl0cnk6DQoJCQlvcy51bmxpbmsob3V0ZikNCgkJZXhj ZXB0IE9TRXJyb3IgYXMgZToNCgkJCWlmIGUuZXJybm8gIT0gZXJybm8uRU5PRU5UOg0KCQkJCXJh aXNlDQoJCXhtbC53cml0ZShvdXRmLCBlbmNvZGluZz0nVVRGLTgnLCB4bWxfZGVjbGFyYXRpb249 JzEuMCcpDQoJCSMgeWF5LCBhZGQgdHJhaWxpbmcgbmV3bGluZSBiZWNhdXNlIGx4bWwgaXMgZHVt Yg0KCQl3aXRoIG9wZW4ob3V0ZiwgJ2FiJykgYXMgZjoNCgkJCWYud3JpdGUoYidcbicpDQoNCmlm IF9fbmFtZV9fID09ICdfX21haW5fXyc6DQoJbWFpbigpDQo= --MP_/PgZM6AVS=xkj0VSyNAtlF2S-- --Sig_/yfMe72+lwvURigXFS//b39Y Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQJ8BAEBCgBmBQJUhz/KXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO46YP/jhO57IxHsWwhcnPGyy956Fq S/tzWKqJFuR6iL2IhsSG0VO9gsYJNP9aJikC5Jzu9VQg+OCP3QDyvvBj+aFghkeW Xga6QhL0URJhAQbBF+ik9CJZfV6nD4KcEGx/1FAjcAHJG98G1iA2bwnY5f9tmbTx +CtYh5V0u9sfHZAVS+54sfZm0tyuOtOqyQfbUntwUrpQfT7oBrVVFM5MM/rW2GUT 7v1nw5cQeqsPxYb0nbWj17XmQlkGqcdrxbMD68gDATPq1SBkPOiw6ys2qbXtjfSr 0LLWaM67DIE80uXc/XF/9RKQz/cr/He4i6Ujcu7qaBYU2bt63vSIyRpsNLvPE01n SiPgyQ0dGV7oWXCv3A1KwEbRHPosPJOhRQ/Y+9MguFXbMO8NScz7HAiZpuzO26ES Ie2bhMHseXDYAHlPiYWYJm5BAMeH+XA9rtZTpryqH5H5hwV0CGqFpl/5KH1nWHYG fiHcOggS70WVKNbZSrJMpmgBAQxF1RH1uHTROKSXOTr2/KTTLbz3/P9bcUj4Ev1u KwiOOAYIXh5go3QMr1oGBLpsdFt1USaG6dcgVijW8i+1hOh1pcbrzgJw0FXFdPJe RUN8V4AM8A7LzKzRD1Nuir+31wFHvuelW3V+FGl3Lkh2s6ERzc47wY/hacWJkjHz gbsjoBYuPOSL1ypj6Bat =rw9o -----END PGP SIGNATURE----- --Sig_/yfMe72+lwvURigXFS//b39Y--