Date: Fri, 7 Jun 2013 07:30:56 +0000 From: "b.f." <bf1783@googlemail.com> To: Matthias Andree <mandree@freebsd.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r320140 - in head/ports-mgmt/tinderbox: . files Message-ID: <CAGFTUwOyuSKTJD2N7411bJuU8jxMC0U_WsqSdSAAS6U=Kbc3hA@mail.gmail.com> In-Reply-To: <201306062225.r56MPBRK027988@svn.freebsd.org> References: <201306062225.r56MPBRK027988@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--047d7b2e43205a218804de8b6992 Content-Type: text/plain; charset=ISO-8859-1 On 6/6/13, Matthias Andree <mandree@freebsd.org> wrote: > Author: mandree > Date: Thu Jun 6 22:25:11 2013 > New Revision: 320140 > URL: http://svnweb.freebsd.org/changeset/ports/320140 > > Log: > Fix display of port fail reasons on the latest_buildports page with > default template (not visible in paefchen template). > > PR: 177491 > Submitted by: Anonymous <r4721@tormail.org> > Approved by: itetcu (maintainer timeout, 68 days) > > Added: > head/ports-mgmt/tinderbox/files/patch-fail-reasons (contents, props > changed) > Modified: > head/ports-mgmt/tinderbox/Makefile > > Modified: head/ports-mgmt/tinderbox/Makefile > ============================================================================== > --- head/ports-mgmt/tinderbox/Makefile Thu Jun 6 22:24:37 2013 (r320139) > +++ head/ports-mgmt/tinderbox/Makefile Thu Jun 6 22:25:11 2013 (r320140) > @@ -3,6 +3,7 @@ > > PORTNAME= tinderbox > PORTVERSION= 4.0.0 > +PORTREVISION= 1 > CATEGORIES= ports-mgmt > MASTER_SITES= http://tinderbox.marcuscom.com/ \ > http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/ > > Added: head/ports-mgmt/tinderbox/files/patch-fail-reasons > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/ports-mgmt/tinderbox/files/patch-fail-reasons Thu Jun 6 22:25:11 > 2013 (r320140) > @@ -0,0 +1,12 @@ > +# http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/177491 by Anonymous > +--- webui/templates/default/latest_buildports.tpl.orig > ++++ webui/templates/default/latest_buildports.tpl > +@@ -50,7 +50,7 @@ > + <?php $reason=$row['port_last_fail_reason']?> > + <td class="<?php if(!empty($port_fail_reasons[$reason]['type']))echo > "fail_reason_".$port_fail_reasons[$reason]['type']?>"> > + <?php $href=isset($port_fail_reasons[$reason]['link']) ? > "index.php?action=display_failure_reasons&failure_reason_tag=$reason#$reason" > : "#"?> > +- <a href="<?php echo $href?>" class="<?php > if(!empty($port_fail_reasons[$reason]['type']))echo > "fail_reason_".$port_fail_reasons[$reason]['type']?>" title="<?php > if(!empty($port_fail_reasons[$reason]['descr']))echo > $port_fail_reasons[$reason]['descr']?>"><?php $reason?></a> > ++ <a href="<?php echo $href?>" class="<?php > if(!empty($port_fail_reasons[$reason]['type']))echo > "fail_reason_".$port_fail_reasons[$reason]['type']?>" title="<?php > if(!empty($port_fail_reasons[$reason]['descr']))echo > $port_fail_reasons[$reason]['descr']?>"><?php echo $reason?></a> > + </td> > + <td> > + <?php if($row['port_link_logfile']){?> > This breaks the build when the webui isn't built -- please fix -- suggested patch attached. (If we are going to remove the webui subdirectory we can simply avoid extracting it in the first place ... ) b. --047d7b2e43205a218804de8b6992 Content-Type: text/plain; charset=US-ASCII; name="tinderbox.diff" Content-Disposition: attachment; filename="tinderbox.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: file0 SW5kZXg6IE1ha2VmaWxlCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIE1ha2VmaWxlCShyZXZpc2lvbiAzMjAxNDkp CisrKyBNYWtlZmlsZQkod29ya2luZyBjb3B5KQpAQCAtNDYsMTAgKzQ2LDEyIEBACiAuZW5kaWYK IAogLmlmIGRlZmluZWQoV0VCVUkpCitFWFRSQV9QQVRDSEVTKz0JJHtQQVRDSERJUn0vZmFpbC1y ZWFzb25zLXBhdGNoCiBXQU5UX1BIUF9XRUI9CXllcwogVVNFX1BIUD0Jc2Vzc2lvbgogUExJU1Rf U1VCKz0JV0VCVUk9IiIKIC5lbHNlCitFWFRSQUNUX0JFRk9SRV9BUkdTPQktLWV4Y2x1ZGUgd2Vi dWkgLXhmCiBQTElTVF9TVUIrPQlXRUJVST0iQGNvbW1lbnQgIgogLmVuZGlmCiAKQEAgLTk4LDEx ICsxMDAsNiBAQAogUlVOX0RFUEVORFMrPQlwNS1Db21wcmVzcy1CemlwMj49MDoke1BPUlRTRElS fS9hcmNoaXZlcnMvcDUtQ29tcHJlc3MtQnppcDIKIC5lbmRpZgogCi0uaWYgISBkZWZpbmVkKFdF QlVJKQotcG9zdC1leHRyYWN0OgotCUAke1JNfSAtUiAke1dSS1NSQ30vd2VidWkKLS5lbmRpZgot CiBwb3N0LXBhdGNoOgogLmlmICEgJHtQT1JUX09QVElPTlM6TUNIRUNLX1JPT1R9CiAJJHtSRUlO UExBQ0VfQ01EfSAtZSAncy9eaWYgXFsgYGlkIC11YCAhPSAwIFxdOyB0aGVuL2lmIGZhbHNlOyB0 aGVuLycgXApJbmRleDogZmlsZXMvZmFpbC1yZWFzb25zLXBhdGNoCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGZp bGVzL2ZhaWwtcmVhc29ucy1wYXRjaAkocmV2aXNpb24gMCkKKysrIGZpbGVzL2ZhaWwtcmVhc29u cy1wYXRjaAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDEyIEBACisjIGh0dHA6Ly93d3cuZnJl ZWJzZC5vcmcvY2dpL3F1ZXJ5LXByLmNnaT9wcj1wb3J0cy8xNzc0OTEgYnkgQW5vbnltb3VzCist LS0gd2VidWkvdGVtcGxhdGVzL2RlZmF1bHQvbGF0ZXN0X2J1aWxkcG9ydHMudHBsLm9yaWcKKysr KyB3ZWJ1aS90ZW1wbGF0ZXMvZGVmYXVsdC9sYXRlc3RfYnVpbGRwb3J0cy50cGwKK0BAIC01MCw3 ICs1MCw3IEBACisgCQkJCTw/cGhwICRyZWFzb249JHJvd1sncG9ydF9sYXN0X2ZhaWxfcmVhc29u J10/PgorIAkJCQk8dGQgY2xhc3M9Ijw/cGhwIGlmKCFlbXB0eSgkcG9ydF9mYWlsX3JlYXNvbnNb JHJlYXNvbl1bJ3R5cGUnXSkpZWNobyAiZmFpbF9yZWFzb25fIi4kcG9ydF9mYWlsX3JlYXNvbnNb JHJlYXNvbl1bJ3R5cGUnXT8+Ij4KKyAJCQkJPD9waHAgJGhyZWY9aXNzZXQoJHBvcnRfZmFpbF9y ZWFzb25zWyRyZWFzb25dWydsaW5rJ10pID8gImluZGV4LnBocD9hY3Rpb249ZGlzcGxheV9mYWls dXJlX3JlYXNvbnMmYW1wO2ZhaWx1cmVfcmVhc29uX3RhZz0kcmVhc29uIyRyZWFzb24iIDogIiMi Pz4KKy0JCQkJPGEgaHJlZj0iPD9waHAgZWNobyAkaHJlZj8+IiBjbGFzcz0iPD9waHAgaWYoIWVt cHR5KCRwb3J0X2ZhaWxfcmVhc29uc1skcmVhc29uXVsndHlwZSddKSllY2hvICJmYWlsX3JlYXNv bl8iLiRwb3J0X2ZhaWxfcmVhc29uc1skcmVhc29uXVsndHlwZSddPz4iIHRpdGxlPSI8P3BocCBp ZighZW1wdHkoJHBvcnRfZmFpbF9yZWFzb25zWyRyZWFzb25dWydkZXNjciddKSllY2hvICRwb3J0 X2ZhaWxfcmVhc29uc1skcmVhc29uXVsnZGVzY3InXT8+Ij48P3BocCAkcmVhc29uPz48L2E+Cisr CQkJCTxhIGhyZWY9Ijw/cGhwIGVjaG8gJGhyZWY/PiIgY2xhc3M9Ijw/cGhwIGlmKCFlbXB0eSgk cG9ydF9mYWlsX3JlYXNvbnNbJHJlYXNvbl1bJ3R5cGUnXSkpZWNobyAiZmFpbF9yZWFzb25fIi4k cG9ydF9mYWlsX3JlYXNvbnNbJHJlYXNvbl1bJ3R5cGUnXT8+IiB0aXRsZT0iPD9waHAgaWYoIWVt cHR5KCRwb3J0X2ZhaWxfcmVhc29uc1skcmVhc29uXVsnZGVzY3InXSkpZWNobyAkcG9ydF9mYWls X3JlYXNvbnNbJHJlYXNvbl1bJ2Rlc2NyJ10/PiI+PD9waHAgZWNobyAkcmVhc29uPz48L2E+Cisg CQkJCTwvdGQ+CisgCQkJCTx0ZD4KKyAJCQkJCTw/cGhwIGlmKCRyb3dbJ3BvcnRfbGlua19sb2dm aWxlJ10pez8+CgpQcm9wZXJ0eSBjaGFuZ2VzIG9uOiBmaWxlcy9mYWlsLXJlYXNvbnMtcGF0Y2gK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpBZGRlZDogZmJzZDpub2tleXdvcmRzCiMjIC0wLDAgKzEgIyMKK3llcwpcIE5v IG5ld2xpbmUgYXQgZW5kIG9mIHByb3BlcnR5CkFkZGVkOiBzdm46ZW9sLXN0eWxlCiMjIC0wLDAg KzEgIyMKK25hdGl2ZQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIHByb3BlcnR5CkFkZGVkOiBzdm46 bWltZS10eXBlCiMjIC0wLDAgKzEgIyMKK3RleHQvcGxhaW4KXCBObyBuZXdsaW5lIGF0IGVuZCBv ZiBwcm9wZXJ0eQpJbmRleDogZmlsZXMvcGF0Y2gtZmFpbC1yZWFzb25zCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IGZpbGVzL3BhdGNoLWZhaWwtcmVhc29ucwkocmV2aXNpb24gMzIwMTQ5KQorKysgZmlsZXMvcGF0 Y2gtZmFpbC1yZWFzb25zCSh3b3JraW5nIGNvcHkpCkBAIC0xLDEyICswLDAgQEAKLSMgaHR0cDov L3d3dy5mcmVlYnNkLm9yZy9jZ2kvcXVlcnktcHIuY2dpP3ByPXBvcnRzLzE3NzQ5MSBieSBBbm9u eW1vdXMKLS0tLSB3ZWJ1aS90ZW1wbGF0ZXMvZGVmYXVsdC9sYXRlc3RfYnVpbGRwb3J0cy50cGwu b3JpZwotKysrIHdlYnVpL3RlbXBsYXRlcy9kZWZhdWx0L2xhdGVzdF9idWlsZHBvcnRzLnRwbAot QEAgLTUwLDcgKzUwLDcgQEAKLSAJCQkJPD9waHAgJHJlYXNvbj0kcm93Wydwb3J0X2xhc3RfZmFp bF9yZWFzb24nXT8+Ci0gCQkJCTx0ZCBjbGFzcz0iPD9waHAgaWYoIWVtcHR5KCRwb3J0X2ZhaWxf cmVhc29uc1skcmVhc29uXVsndHlwZSddKSllY2hvICJmYWlsX3JlYXNvbl8iLiRwb3J0X2ZhaWxf cmVhc29uc1skcmVhc29uXVsndHlwZSddPz4iPgotIAkJCQk8P3BocCAkaHJlZj1pc3NldCgkcG9y dF9mYWlsX3JlYXNvbnNbJHJlYXNvbl1bJ2xpbmsnXSkgPyAiaW5kZXgucGhwP2FjdGlvbj1kaXNw bGF5X2ZhaWx1cmVfcmVhc29ucyZhbXA7ZmFpbHVyZV9yZWFzb25fdGFnPSRyZWFzb24jJHJlYXNv biIgOiAiIyI/PgotLQkJCQk8YSBocmVmPSI8P3BocCBlY2hvICRocmVmPz4iIGNsYXNzPSI8P3Bo cCBpZighZW1wdHkoJHBvcnRfZmFpbF9yZWFzb25zWyRyZWFzb25dWyd0eXBlJ10pKWVjaG8gImZh aWxfcmVhc29uXyIuJHBvcnRfZmFpbF9yZWFzb25zWyRyZWFzb25dWyd0eXBlJ10/PiIgdGl0bGU9 Ijw/cGhwIGlmKCFlbXB0eSgkcG9ydF9mYWlsX3JlYXNvbnNbJHJlYXNvbl1bJ2Rlc2NyJ10pKWVj aG8gJHBvcnRfZmFpbF9yZWFzb25zWyRyZWFzb25dWydkZXNjciddPz4iPjw/cGhwICRyZWFzb24/ PjwvYT4KLSsJCQkJPGEgaHJlZj0iPD9waHAgZWNobyAkaHJlZj8+IiBjbGFzcz0iPD9waHAgaWYo IWVtcHR5KCRwb3J0X2ZhaWxfcmVhc29uc1skcmVhc29uXVsndHlwZSddKSllY2hvICJmYWlsX3Jl YXNvbl8iLiRwb3J0X2ZhaWxfcmVhc29uc1skcmVhc29uXVsndHlwZSddPz4iIHRpdGxlPSI8P3Bo cCBpZighZW1wdHkoJHBvcnRfZmFpbF9yZWFzb25zWyRyZWFzb25dWydkZXNjciddKSllY2hvICRw b3J0X2ZhaWxfcmVhc29uc1skcmVhc29uXVsnZGVzY3InXT8+Ij48P3BocCBlY2hvICRyZWFzb24/ PjwvYT4KLSAJCQkJPC90ZD4KLSAJCQkJPHRkPgotIAkJCQkJPD9waHAgaWYoJHJvd1sncG9ydF9s aW5rX2xvZ2ZpbGUnXSl7Pz4K --047d7b2e43205a218804de8b6992--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGFTUwOyuSKTJD2N7411bJuU8jxMC0U_WsqSdSAAS6U=Kbc3hA>