Merge lp:~ricardokirkner/locolander/lean-output into lp:locolander

[Ricardo Kirkner]

limit verboseness of merge request processing output to the minimum

[Facundo Batista (facundo)]

review: Approve

=== modified file 'docker/scripts/locolander'
--- docker/scripts/locolander	2013-07-09 18:43:37 +0000
+++ docker/scripts/locolander	2013-07-27 00:07:32 +0000
@@ -26,12 +26,12 @@
 
 # 1. get target branch
 echo "Getting target branch ($TARGET) ..."
-bzr branch $TARGET target
+OUTPUT=$(bzr branch $TARGET target 2>&1)
 
 # 2. merge source
 echo "Merging source branch ($SOURCE) into target ..."
 cd target
-bzr merge $SOURCE
+OUTPUT=$(bzr merge $SOURCE 2>&1)
 
 # figure out if there are any changes
 DIFF=$(bzr diff)
@@ -53,8 +53,8 @@
 if [ -e Dockerfile ]; then
     mv Dockerfile .Dockerfile.locolander
 fi
-python ns2df.py $PROJECT .locolander.yml Dockerfile
-OUTPUT=$(docker build -t $PROJECT .)
+OUTPUT=$(python ns2df.py $PROJECT .locolander.yml Dockerfile 2>&1)
+OUTPUT=$(docker build -t $PROJECT . 2>&1)
 if [ -z $? -o "`echo $OUTPUT | grep 'Error'`" != "" ]; then
     echo "FAILURE - Build failed:"
     echo $OUTPUT
@@ -67,8 +67,7 @@
 
 # 4. run test script using image
 echo "Running tests ..."
-OUTPUT=$(docker run $PROJECT)
-echo $OUTPUT
+docker run $PROJECT
 
 if [ -z $? -o "`echo $OUTPUT | grep 'Error'`" != "" ]; then
     echo "FAILURE - Tests failed"
@@ -79,14 +78,14 @@
 echo "Committing merge ..."
 
 if [ "$AUTHOR" != "" ]; then
-    bzr commit -m "$COMMIT_MSG" --author="$AUTHOR"
+    OUTPUT=$(bzr commit -m "$COMMIT_MSG" --author="$AUTHOR" 2>&1)
 else
-    bzr commit -m "$COMMIT_MSG"
+    OUTPUT=$(bzr commit -m "$COMMIT_MSG" 2>&1)
 fi
 
 # 6. push branch
 echo "Pushing merge ..."
-bzr push $TARGET
+OUTPUT=$(bzr push $TARGET 2>&1)
 
 echo "SUCCESS"
 
 
=== modified file 'locolander/locolanderweb/templates/locolanderweb/project/detail.html'
--- locolander/locolanderweb/templates/locolanderweb/project/detail.html	2013-07-22 01:00:12 +0000
+++ locolander/locolanderweb/templates/locolanderweb/project/detail.html	2013-07-27 00:07:32 +0000
@@ -37,9 +37,8 @@
             <span>
             {{ entry.timestamp }}
             </span>
-            <pre style="background: #eeeeee;">
-            {{ entry.raw|wordwrap:120 }}
-            </pre>
+            {% comment %}make sure not to add any extra whitespace between the pre tags{% endcomment %}
+            <pre style="background: #eeeeee;">{{ entry.raw|linebreaksbr }}</pre>
         </div>
         {% endfor %}
         {% endif %}