Date: Sun, 22 Nov 2015 11:41:33 -0500 From: Ricky G <ricky1252@hotmail.com> Cc: "freebsd-testing@freebsd.org" <freebsd-testing@freebsd.org>, "freebsd-ports@freebsd.org" <freebsd-ports@freebsd.org> Subject: RE: Call for Help: need script for patching ports tree, building with poudriere Message-ID: <SNT146-W266F25359A8C2F8F92F021A1180@phx.gbl> In-Reply-To: <SNT146-W4271A2597FBC1A75A972A6A11A0@phx.gbl> References: <CAG=rPVcOb4g9DD08c7vAsor8UMf3GnckAJ2wkO37p8Ao3G2GwA@mail.gmail.com>, , <SNT146-W8224851E20D3E1FDA17AD4A1150@phx.gbl>, , <CAG=rPVfZV4kZbhG5c-%2BrjFG4vGTzMmrRasSyBQ%2BgCtY8FBEtoA@mail.gmail.com>, , <SNT146-W629FAF58F79486179755FEA1100@phx.gbl>, , <564EDE98.9070508@toco-domains.de>, <SNT146-W4271A2597FBC1A75A972A6A11A0@phx.gbl>
next in thread | previous in thread | raw e-mail | index | archive | help
--_e0c794d8-24c0-43ee-bc8e-14c5db0d5c5c_ Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Portest version 0.0.2=20 Changelog: * Fixed Usage with incorrect description on some options* Added multiple pa= tchfile/glob support* More failed patch output=2C Still working on formatin= g. Ideas would be great.* Changed BUILT_LIST filter to fix unintended strip= ping of multiple ports* Changed revert (-R) to (-r) and added a new revert = (-R) method.* Several changed to revert more explained below As pointed out to me=2C svn revert -R seems to somehow miss small filename= s. This is an svn bug and as a workaround I decided to remove the -r option= as it was unreliable altogether=2C move the -R to -r=2C and added a filter= ed revert for the smaller filenames. This solution works well on all my tes= ts with 15+ large diff files=2C but of course more testing is needed. The n= ew -R option will instead of reverting according to the diff=2C revert base= d on changed from the tree. This method is much slower but in the event -r = may fail an -R will fix everything regardless of .diff. = --_e0c794d8-24c0-43ee-bc8e-14c5db0d5c5c_ Content-Type: application/octet-stream Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="portest" IyEvYmluL3NoCiMKIyBDb3B5cmlnaHQgKGMpIDIwMTUsIFJpY2t5IEdhbGxhbW9yZSA8dWx0aW1h MTI1MkBnbWFpbC5jb20+CiMgQWxsIHJpZ2h0cyByZXNlcnZlZC4KIwojIFJlZGlzdHJpYnV0aW9u IGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAojIG1v ZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29u ZGl0aW9ucyBhcmUgbWV0OgojIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0 IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CiMgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29u ZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgojIDIuIFJlZGlzdHJpYnV0aW9u cyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CiMgICAg bm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFp bWVyIGluIHRoZQojICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92 aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCiMgMy4gQWxsIGFkdmVydGlzaW5nIG1hdGVyaWFs cyBtZW50aW9uaW5nIGZlYXR1cmVzIG9yIHVzZSBvZiB0aGlzIHNvZnR3YXJlCiMgICAgbXVzdCBk aXNwbGF5IHRoZSBmb2xsb3dpbmcgYWNrbm93bGVkZ2VtZW50OgojICAgIFRoaXMgcHJvZHVjdCBp bmNsdWRlcyBzb2Z0d2FyZSBkZXZlbG9wZWQgYnkgdGhlIDxvcmdhbml6YXRpb24+LgojIDQuIE5l aXRoZXIgdGhlIG5hbWUgb2YgdGhlIDxvcmdhbml6YXRpb24+IG5vciB0aGUKIyAgICBuYW1lcyBv ZiBpdHMgY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9k dWN0cwojICAgIGRlcml2ZWQgZnJvbSB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJp b3Igd3JpdHRlbiBwZXJtaXNzaW9uLgojCiMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSA8 Q09QWVJJR0hUIEhPTERFUj4gJydBUyBJUycnIEFORCBBTlkKIyBFWFBSRVNTIE9SIElNUExJRUQg V0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRSBJTVBMSUVECiMg V0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxB UiBQVVJQT1NFIEFSRQojIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIDxDT1BZUklHSFQg SE9MREVSPiBCRSBMSUFCTEUgRk9SIEFOWQojIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUws IFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTCiMgKElOQ0xVRElO RywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9S IFNFUlZJQ0VTOwojIExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJ TlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORAojIE9OIEFOWSBUSEVPUlkgT0YgTElBQklM SVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCiMgKElO Q0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBP RiBUSEUgVVNFIE9GIFRISVMKIyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NT SUJJTElUWSBPRiBTVUNIIERBTUFHRS4KClBPUlRFU1RfVkVSU0lPTj0iMC4wLjIiCgp1c2FnZSgp IHsKCWNhdCA8PCBFT0YKVXNhZ2U6IHBvcnRlc3QgWy1mIGJ1bGtmaWxlXSBbLWFwUHJSdFR2XSBm aWxlLmRpZmYgZmlsZTIuZGlmZiAuLi4KCk9wdGlvbnM6CiAgICAtYSAgICAgLS0gIERvIGV2ZXJ5 dGhpbmcgZXhjZXB0IHJldmVydCAoLXB0ZiBidWlsZC5wb3J0cy50eHQpCiAgICAtZiAgICAgLS0g IEdlbmVyYXRlIGEgcG91ZGllcmUgdXNhYmxlIGJ1bGsgZmlsZQogICAgLXAgICAgIC0tICBQYXRj aCwgd2lsbCBleGl0IG9uIGZhaWwgd2l0aCBvdXRwdXQKICAgIC1QICAgICAtLSAgUGF0Y2gsIGRv IG5vdCBleGl0IG9uIGZhaWxlZCBwYXRjaAogICAgLXIgICAgIC0tICBSZXZlcnQgdGhlIGZpbGVz IGxpc3RlZCBpbiBwYXRjaGZpbGUsIGZhc3QgYW5kCiAgICAgICAgICAgICAgIHNob3VsZCBiZSBh bGwgdGhhdHMgcmVxdWlyZWQKICAgIC1SICAgICAtLSAgUmV2ZXJ0IG1vZGlmaWNhdGlvbnMgYWNj b3JkaW5nIHRyZWUsIHNsb3cgYnV0CiAgICAgICAgICAgICAgIHdpbGwgZ3VhcmFudGVlIHRyZWUg aW50ZWdyaXR5CiAgICAtdCAgICAgLS0gIFRlc3Qgd2l0aCBwb3J0bGludAogICAgLVQgICAgIC0t ICBUZXN0IHdpdGggcG9ydCB0ZXN0LCBvciBwb3VkcmllcmUgZGVwZW5kaW5nIG9uCiAgICAgICAg ICAgICAgIFVTRV9QT1VEUklFUkUKICAgIC12ICAgICAtLSAgU2hvdyB2ZXJzaW9uIG9mIHBvcnRl c3QKCkJ5IGRlZmF1bHQsIChubyBvcHRpb25zKSBwb3J0ZXN0IGRvZXMgbm90aGluZwpFT0YKCWV4 aXQgMQp9Cgp3aGlsZSBnZXRvcHRzICI6YWY6cFByUnRUdiIgRkxBRzsgZG8KCWNhc2UgIiR7RkxB R30iIGluCglhKQoJCUFMTD0iWUVTIgoJCTs7CglmKQoJCVBPVURSSUVSRV9CVUxLPSJZRVMiCgkJ UE9VRFJJRVJFX0JVTEtfRklMRT0iJHtPUFRBUkd9IgoJCTs7CglwKQoJCVBBVENIPSJZRVMiCgkJ OzsKCVApCgkJUEFUQ0hfRkFJTEVEX0VYSVQ9Ik5PIgoJCTs7CglyKQoJCVJFVkVSVF9TT0ZUPSJZ RVMiCgkJOzsKCVIpCgkJUkVWRVJUX0hBUkQ9IllFUyIKCQk7OwoJdCkKCQlURVNUX1BPUlRMSU5U PSJZRVMiCgkJOzsKCVQpCgkJVEVTVF9CVUlMRD0iWUVTIgoJCTs7Cgl2KQoJCWVjaG8gIiR7UE9S VEVTVF9WRVJTSU9OfSIKCQlleGl0IDAKCWVzYWMKZG9uZQoKc2hpZnQgIiQoKE9QVElORC0xKSki CgpbICQjIC1sdCAxIF0gJiYgdXNhZ2UKCgpTVk49InN2bmxpdGUiClNWTl9QQVRDSF9BUkdTPSJw YXRjaCIKU1ZOX1JFVkVSVF9BUkdTPSJyZXZlcnQgLVIiClBPUlRMSU5UPSJwb3J0bGludCIKUE9S VExJTlRfQVJHUz0iLUEiClBPUlQ9InBvcnQiClBPUlRfQVJHUz0idGVzdCIKUE9SVFNESVI9Ii91 c3IvcG9ydHMiCkJVTEtfRklMRT0iYnVpbGQucG9ydHMudHh0IgoKVVNFX1BPVURSSUVSRT0iWUVT IgpQT1VEUklFUkVfSkFJTFM9IjEwMmFtZDY0IDEwMmkzODYgOTNhbWQ2NCA5M2kzODYiClBPVURS SUVSRV9QT1JUU0RJUj0iL3Vzci9sb2NhbC9wb3VkcmllcmUvcG9ydHMiClBPVURSSUVSRV9QT1JU PSJ0ZXN0IgpQT1VEUklFUkU9InBvdWRyaWVyZSIKUE9VRFJJRVJFX0FSR1M9ImJ1bGsgLXQgLUMg LXAgJHtQT1VEUklFUkVfUE9SVH0iCgojIFNldCBwb3VkcmllcmUgcG9ydHMgZGlyIGlmIGJlaW5n IHVzZWQgIwppZiBbICIke1VTRV9QT1VEUklFUkV9IiA9PSAiWUVTIiBdOyB0aGVuClBPUlRTRElS PSIke1BPVURSSUVSRV9QT1JUU0RJUn0vJHtQT1VEUklFUkVfUE9SVH0iCmZpCgoKQ1VSRElSPSJg cHdkYCIKCiMgQ2hlY2sgUE9SVFNESVIgIwppZiBbIC1kICIke1BPUlRTRElSfSIgXTsgdGhlbgpl bHNlCgllY2hvICJQT1JUU0RJUiBub3Qgc2V0IG9yIGluY29ycmVjdCBkaXJlY3RvcnkiCglleGl0 IDEKZmkKaWYgWyAiaGVhZC9NYWtlZmlsZSIgIT0gImBoZWFkIC0xICIke1BPUlRTRElSfS9NYWtl ZmlsZSIgfCBncmVwIC1vIGhlYWQvTWFrZWZpbGVgIiBdOyB0aGVuCgllY2hvICJQT1JUU0RJUiBp cyBzZXQgdG8gYW4gaW5jb3JyZWN0IGRpcmVjdG9yeSIKCWV4aXQgMQpmaQoKIyBDaGVjayBQT1JU U0RJUiBpcyBhbiBzdm4gdHJlZSAjCmNkICR7UE9SVFNESVJ9CiR7U1ZOfSBpbmZvID4vZGV2L251 bGwgMj4mMQpbICQ/IC1lcSAxIF0gJiYgZWNobyAiUE9SVFNESVIgaXMgbm90IGFuIHN2biB0cmVl IiAmJiBleGl0IDEKCiMgU2V0IHBhdGNoZmlsZSBwYXRoICMKY2QgIiR7UE9SVFNESVJ9Igpmb3Ig ZmlsZSBpbiAkQDsgZG8KCWlmIFsgLWYgIiRmaWxlIiBdOyB0aGVuCgkJUEFUQ0hfRklMRT0iJHtQ QVRDSF9GSUxFfSAkZmlsZSIKCWVsaWYgWyAtZiAiJHtDVVJESVJ9LyRmaWxlIiBdOyB0aGVuCgkJ UEFUQ0hfRklMRT0iJHtQQVRDSF9GSUxFfSAke0NVUkRJUn0vJGZpbGUiCgllbHNlCgkJZWNobyAi JGZpbGUgbm90IGZvdW5kIgoJCWV4aXQgMQoJZmkKZG9uZQoKIyMjIFBhdGNoIFRyZWUgIyMjCmlm IFsgIiR7UEFUQ0h9IiA9PSAiWUVTIiBdIHx8IFsgIiR7UEFUQ0hfRkFJTEVEX0VYSVR9IiA9PSAi Tk8iIF0gfHwgWyAiJHtBTEx9IiA9PSAiWUVTIiBdOyB0aGVuCglmb3IgZmlsZSBpbiAke1BBVENI X0ZJTEV9OyBkbwoJCVNWTl9PVVRQVVQ9IiR7U1ZOX09VVFBVVH0KImAke1NWTn0gJHtTVk5fUEFU Q0hfQVJHU30gIiRmaWxlImAKCQlkb25lCglpZiBbICQ/IC1uZSAwIF0gJiYgWyAiJHtQQVRDSF9G QUlMRURfRVhJVH0iICE9ICJOTyIgXSB8fCBbICJgZWNobyAiJHtTVk5fT1VUUFVUfSIgfCBncmVw IC1tIDEgLW8gcmVqZWN0ZWRgIiA9PSAicmVqZWN0ZWQiIF0gJiYgWyAiJHtQQVRDSF9GQUlMRURf RVhJVH0iICE9ICJOTyIgXTsgdGhlbgoJCWZvciBmaWxlIGluIGBlY2hvICIke1NWTl9PVVRQVVR9 IiB8IGdyZXAgLUIgMSAicmVqZWN0ZWQiIHwgZ3JlcCAtdiAiPiIgfCBhd2sgJ3sgcHJpbnQgJDIg fSdgOyBkbwoJCQllY2hvICIke1NWTl9PVVRQVVR9IiB8IGdyZXAgLUEgMSAiJGZpbGUiCgkJCWNh dCAiJHtQT1JUU0RJUn0vJGZpbGUuc3ZucGF0Y2gucmVqIgoJCWRvbmUKCQllY2hvICIke1NWTl9P VVRQVVR9IgoJCWVjaG8gIlBhdGNoIEZhaWxlZCIKCQlleGl0IDEKCWVsc2UKCQlmb3IgZmlsZSBp biBgZWNobyAiJHtTVk5fT1VUUFVUfSIgfCBncmVwIC1CIDEgInJlamVjdGVkIiB8IGdyZXAgLXYg Ij4iIHwgYXdrICd7IHByaW50ICQyIH0nYDsgZG8KCQkJZWNobyAiJHtTVk5fT1VUUFVUfSIgfCBn cmVwIC1BIDEgIiRmaWxlIgoJCQljYXQgIiR7UE9SVFNESVJ9LyRmaWxlLnN2bnBhdGNoLnJlaiIK CQlkb25lCgkJZWNobyAiJHtTVk5fT1VUUFVUfSIKCWZpCmZpCgojIEdlbmVyYXRlIGEgbGlzdCBv ZiBwb3J0cyBmb3IgcG91ZHJpZXJlIHRvIGJ1aWxkICMKQlVJTERfTElTVD0iYChjYXQgJHtQQVRD SF9GSUxFfSB8IGdyZXAgJ15JbmRleDpbIF0uKicgfCBzZWQgJ3MvXkluZGV4OiAvLyA7IHMvXltN VEtdLiovLycgfCBncmVwIC1vICdeLipcLy4qXC8nIHwgc2VkICdzL14uKlwvLipcL2ZpbGVzXC8k Ly8gOyBzL1wvJC8vJyB8IHNvcnQgfCBhd2sgJyFhWyQwXSsrJylgIgoKIyMjIEJ1bGsgRmlsZSAj IyMKY2QgJHtDVVJESVJ9CmlmIFsgIiRQT1VEUklFUkVfQlVMSyIgPT0gIllFUyIgXTsgdGhlbgpl Y2hvICIke0JVSUxEX0xJU1R9IiA+IiR7UE9VRFJJRVJFX0JVTEtfRklMRX0iCmVsaWYgWyAiJHtB TEx9IiA9PSAiWUVTIiBdOyB0aGVuCmVjaG8gIiR7QlVJTERfTElTVH0iID4iJHtCVUxLX0ZJTEV9 IgpmaQoKIyMjIFBvcnRsaW50ICMjIwppZiBbICIke1RFU1RfUE9SVExJTlR9IiA9PSAiWUVTIiBd IHx8IFsgIiR7QUxMfSIgPT0gIllFUyIgXTsgdGhlbgoJZm9yIHBvcnQgaW4gJHtCVUlMRF9MSVNU fTsgZG8KCQljZCAiJHtQT1JUU0RJUn0vJHBvcnQiCgkJZWNobyAiJHBvcnQiCgkJJHtQT1JUTElO VH0gJHtQT1JUTElOVF9BUkdTfQoJZG9uZQpmaQoKIyMjIFBvcnQgdGVzdCBhbmQgUG91ZHJpZXJl IHRlc3RpbmcgIyMjCmlmIFsgIiR7VEVTVF9CVUlMRH0iID09ICJZRVMiIF0gJiYgWyAiJHtVU0Vf UE9VRFJJRVJFfSIgPT0gIk5PIiBdOyB0aGVuCglybSAtcmYgImBmaW5kICR7UE9SVFNESVJ9IC10 eXBlIGRpcmVjdG9yeSAtbmFtZSAid29yayIgLW1heGRlcHRoIDNgIgoJZm9yIHBvcnQgaW4gJHtC VUlMRF9MSVNUfTsgZG8KCQljZCAiJHtQT1JUU0RJUn0vJHBvcnQiCgkJbWFrZSBkZXBlbmRzIEJB VENIPXllcwoJCSR7UE9SVH0gJHtQT1JUX0FSR1N9Cglkb25lCmVsaWYgWyAiJHtURVNUX0JVSUxE fSIgPT0gIllFUyIgXSAmJiBbICIke1VTRV9QT1VEUklFUkV9IiA9PSAiWUVTIiBdOyB0aGVuCglm b3IgamFpbCBpbiAke1BPVURSSUVSRV9KQUlMU307IGRvCgkJJHtQT1VEUklFUkV9ICR7UE9VRFJJ RVJFX0FSR1N9IC1qICRqYWlsICR7QlVJTERfTElTVH0KCWRvbmUKZmkKCiMjIyBSZXZlcnQgUGF0 Y2ggIyMjCmNkICR7UE9SVFNESVJ9CmlmIFsgIiR7UkVWRVJUX1NPRlR9IiA9PSAiWUVTIiBdICYm IFsgIiR7UkVWRVJUX0hBUkR9IiAhPSAiWUVTIiBdOyB0aGVuCiMgR2VuZXJhdGUgYSBsaXN0IG9m IGZpbGVzIHRoYXQgd2VyZSBwYXRjaGVkICMKCVBBVENIX0ZJTEVTX0xJU1Q9ImBjYXQgJHtQQVRD SF9GSUxFfSB8IGdyZXAgJ15JbmRleDpbIF0uKicgfCBhd2sgJ3sgcHJpbnQgJDIgfScgfCBzb3J0 YCIKIyBXaWVyZCBjYXNlcyB3aGVyZSBzdm4gd29uJ3Qgc2VlIHNob3J0IGZpbGVuYW1lcyBpbiBs aXN0LiAgICAjCiMgVGhpcyBzZWVtcyB0byBiZSBhbiBzdm4gYnVnLCB0aGlzIGxpc3QgaGVscHMg aW4gdGhvc2UgY2FzZXMgIwoJUEFUQ0hfRklMRVNfRklMVEVSRUQ9YGVjaG8gIiR7UEFUQ0hfRklM RVNfTElTVH0iIHwgZ3JlcCAtdiAnXlthLXpdLipcLy4qXC8uKidgCglmb3IgZmlsZSBpbiAke0JV SUxEX0xJU1R9OyBkbwoJCXJtIC1yZiAiJHtQT1JUU0RJUn0vJGZpbGUiCglkb25lCglmb3IgZmls ZSBpbiAke1BBVENIX0ZJTEVTX0xJU1R9OyBkbwoJCXJtIC1yZiAiJHtQT1JUU0RJUn0vJGZpbGUi Cglkb25lCgkke1NWTn0gJHtTVk5fUkVWRVJUX0FSR1N9ICR7QlVJTERfTElTVH0KCSR7U1ZOfSAk e1NWTl9SRVZFUlRfQVJHU30gJHtQQVRDSF9GSUxFU19MSVNUfQoJJHtTVk59ICR7U1ZOX1JFVkVS VF9BUkdTfSAke1BBVENIX0ZJTEVTX0ZJTFRFUkVEfQplbGlmIFsgIiR7UkVWRVJUX0hBUkR9IiAg PT0gIllFUyIgXTsgdGhlbgoJZm9yIGZpbGUgaW4gYCR7U1ZOfSBzdGF0dXMgfCBhd2sgJ3sgcHJp bnQgJDIgfSdgOyBkbwoJCXJtIC1yZiAiJHtQT1JUU0RJUn0vJGZpbGUiCglkb25lCgkke1NWTn0g JHtTVk5fUkVWRVJUX0FSR1N9ICR7UE9SVFNESVJ9CmZpCg== --_e0c794d8-24c0-43ee-bc8e-14c5db0d5c5c_--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?SNT146-W266F25359A8C2F8F92F021A1180>