This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via b171633c7e15a1fceacfae9953ad9b5b6a07e945 (commit) via 212fd689a30a7b2f627149ead8d45823dc8a68af (commit) from 32a5fec71c317aa47ad27abecd3a63bda513972b (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit b171633c7e15a1fceacfae9953ad9b5b6a07e945 Merge: 32a5fec 212fd68 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Apr 13 12:17:53 2015 +0200

Merge remote-tracking branch 'amarx/BUG10796' into next

commit 212fd689a30a7b2f627149ead8d45823dc8a68af Author: Alexander Marx alexander.marx@ipfire.org Date: Mon Apr 13 07:52:25 2015 +0200

BUG10796: Fix textoutput when doing pakfire update in WebUI

-----------------------------------------------------------------------

Summary of changes: html/cgi-bin/pakfire.cgi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

Difference in files: diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index 2a7ca84..143f123 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -191,14 +191,14 @@ if ($return) { <form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='image' alt='$Lang::tr{'reload'}' title='$Lang::tr{'reload'}' src='/images/view-refresh.png' /> </form> - <tr><td colspan='2' align='left'><pre> + <tr><td colspan='2' align='left'><code> END my @output = `grep pakfire /var/log/messages | tail -20`; foreach (@output) { - print "$_"; + print "$_<br>"; } print <<END; - </pre> + </code> </table> END &Header::closebox();

hooks/post-receive -- IPFire 2.x development tree