| Summary: | Unified patch display sometimes shows garbled patches | ||
|---|---|---|---|
| Product: | [Community] Bugzilla | Reporter: | Peter Jones <pjones> |
| Component: | Attachments/Requests | Assignee: | Jeff Fearn 🐞 <jfearn> |
| Status: | CLOSED NEXTRELEASE | QA Contact: | tools-bugs <tools-bugs> |
| Severity: | low | Docs Contact: | |
| Priority: | low | ||
| Version: | devel | CC: | ajax, ebaak, fweimer, jfearn, mcroce, mtahir, mtyson, notting, qgong, yselkowi |
| Target Milestone: | --- | Keywords: | Reopened |
| Target Release: | --- | ||
| Hardware: | Unspecified | ||
| OS: | Unspecified | ||
| Whiteboard: | |||
| Fixed In Version: | 5.0.3.rh12 | Doc Type: | Bug Fix |
| Doc Text: | Story Points: | --- | |
| Clone Of: | Environment: | ||
| Last Closed: | 2016-10-28 06:04:52 UTC | Type: | --- |
| Regression: | --- | Mount Type: | --- |
| Documentation: | --- | CRM: | |
| Verified Versions: | Category: | --- | |
| oVirt Team: | --- | RHEL 7.3 requirements from Atomic Host: | |
| Cloudforms Team: | --- | Target Upstream Version: | |
|
Description
Peter Jones
2011-09-13 19:24:33 UTC
Did a test on Mozilla's landfill bugzilla 3.6 (https://landfill.bugzilla.org/bugzilla-3.6-branch/attachment.cgi?id=1833&action=diff), and it was broken, and a test on landfill bugzilla 4.0 (https://landfill.bugzilla.org/bugzilla-4.0-branch/attachment.cgi?id=2042&action=diff) and it worked fine. Since there is an acceptable work around, we won't fix thus until we upgrade to Bugzilla 4.0 (scheduled for early 2012) Reopening, this may be fixed upstream but it appears to be broken here. Consider this bug: https://bugzilla.redhat.com/show_bug.cgi?id=1030853 and this attachment on it: https://bugzilla.redhat.com/attachment.cgi?id=825827&action=diff Clicking 'raw unified' on the above attachment view page gives this URL: https://bugzilla.redhat.com/attachment.cgi?id=825827&action=diff&context=patch&collapsed=&headers=1&format=raw And this content: ====== @@ -, +, @@ --- gst/gstpluginloader.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) --- a/gst/gstpluginloader.c +++ a/gst/gstpluginloader.c @@ -996,27 +996,31 @@ exchange_packets (GstPluginLoader * l) l->tx_buf_write - l->tx_buf_read); if (!l->rx_done) { - if (gst_poll_fd_has_error (l->fdset, &l->fd_r) || - gst_poll_fd_has_closed (l->fdset, &l->fd_r)) { - GST_LOG ("read fd %d closed/errored", l->fd_r.fd); + if (gst_poll_fd_has_error (l->fdset, &l->fd_r)) { + GST_LOG ("read fd %d errored", l->fd_r.fd); goto fail_and_cleanup; } if (gst_poll_fd_can_read (l->fdset, &l->fd_r)) { if (!read_one (l)) goto fail_and_cleanup; + } else if (gst_poll_fd_has_closed (l->fdset, &l->fd_r)) { + GST_LOG ("read fd %d closed", l->fd_r.fd); + goto fail_and_cleanup; } } if (l->tx_buf_read < l->tx_buf_write) { - if (gst_poll_fd_has_error (l->fdset, &l->fd_w) || - gst_poll_fd_has_closed (l->fdset, &l->fd_r)) { - GST_ERROR ("write fd %d closed/errored", l->fd_w.fd); + if (gst_poll_fd_has_error (l->fdset, &l->fd_w)) { + GST_ERROR ("write fd %d errored", l->fd_w.fd); goto fail_and_cleanup; } if (gst_poll_fd_can_write (l->fdset, &l->fd_w)) { if (!write_one (l)) goto fail_and_cleanup; + } else if (gst_poll_fd_has_closed (l->fdset, &l->fd_w)) { + GST_LOG ("write fd %d closed", l->fd_w.fd); + goto fail_and_cleanup; } } } while (l->tx_buf_read < l->tx_buf_write); -- ====== I'm happy to leave this open. It will be automatically fixed when we migrate to running Bugzilla on RHEL 6 (due to a newer version of the Patch Reader module) -- simon (In reply to Simon Green from comment #1) > Did a test on Mozilla's landfill bugzilla 3.6 > (https://landfill.bugzilla.org/bugzilla-3.6-branch/attachment. > cgi?id=1833&action=diff), and it was broken, and a test on landfill bugzilla > 4.0 > (https://landfill.bugzilla.org/bugzilla-4.0-branch/attachment. > cgi?id=2042&action=diff) and it worked fine. > > Since there is an acceptable work around, we won't fix thus until we upgrade > to Bugzilla 4.0 (scheduled for early 2012) Both links there currently display malformed diffs. This is a bug in the PatchReader perl module. I've submitted a patch upstream to address this. The patch is waiting for review. This bug was accidentally moved from POST to MODIFIED via an error in automation, please see mmccune with any questions Hi Matt, can you give me an idea of how long you think it would take to replace the current diff viewer with https://github.com/rtfpessoa/diff2html ? Looks like: https://diff2html.xyz/demo#line-by-line https://diff2html.xyz/demo#side-by-side It shouldn't be too hard, and it would be good to send a patch upstream. *** Bug 554878 has been marked as a duplicate of this bug. *** Note for QE: Please check the URLs for patches from Bug 554878 to ensure they render properly. (In reply to Jeff Fearn from comment #12) > Note for QE: Please check the URLs for patches from Bug 554878 to ensure > they render properly. Since the QE test server didn't dump the attachment data of production, so I just create an attachment to test. Seems it works well now. https://bz-web.host.qe.eng.pek2.redhat.com/show_bug.cgi?id=554878 @Jeff could you confirm it. They look good to me! *** Bug 1514087 has been marked as a duplicate of this bug. *** |