On 11/12/2012 01:31 PM, Tomas Lestach wrote:
>> Yes, my cobbler log contains some helpful info, but how to bring this
>> excerpt to the UI if we are only reacting to a download that failed? I
>> didn't dig deep into it, I just wanted to hide the html source of the 500
>> error page. But I agree it would be much better to present such details to
>> the user.
>
> I patched our cobbler, because in cause of a cheetah error it returned
> different output for rhel5(mod_python) and rhel6(mod_wsgi). Now, we shall get
> 500 with the error in the response body in both cases.
>
> On WebUI for these cases - I removed the 'Download Kickstart File' link,
> displayed an error message and changed the error backgrond to make sure the
> user notices the problem.
>
> Let me know if you still would like to make some changes.
>
>>
>> Excerpt from cobbler.log:
>>
>> ...
>> Here is the corresponding Cheetah code.
>> ** I had to guess the line & column numbers, so they are probably incorrect:
>>
>> Line 47, column 8
>>
>> Line|Cheetah Code
>> ----|-------------------------------------------------------------
>> 44 |
>> 45 |mkdir -p /tmp/rhn
>> 46 |
>> 47 |drives=$(list-harddrives | awk '{print $1}')
>> ^
>> 48 |for disk in $drives; do
>> 49 | DISKS="$DISKS $(fdisk -l /dev/$disk | grep -v "swap\|LVM\|Extended"
>> | awk '/^\/dev/{print $1}')"
>> 50 |done
>> ...
>>
>> BTW: This error occurred with a kickstart file that was generated using the
>> wizard and pasted into the new profile form afterwards. The cheetah seems
>> to complain about the $ signs in the bash code and wants me to escape them.
>> Actually I would expect this to work, or not? Not so sure how the cheetah
>> will distinguish between bash $ signs and kickstart variables?
>
> Right, this is the behavior I know since my first tries with Spacewalk
> kickstart profiles. I mean it's because of the templating feature.
> You either have to escape the dollar signs or have to put the dollar
> containing code into the #raw..#end block.
>
>>
>> Thanks,
>> Johannes
>
> Related commits:
> 747754ef
> 74aa5047
> d1789a9e
Thank you, I merged your commits into our branch, but did not do any testing
yet.
Two remarks regarding d1789a9e:
- I fixed a typo in one of the new messages: "bellow" -> "below"
- I think we could omit the ';' after the '}' of the newly inserted css
A patch is attached.
Regards,
Johannes
--
SUSE LINUX Products GmbH, HRB 16746 (AG Nürnberg)
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer
>From 2062558127111d5fec6d1d2313d6d67e9b4208e0 Mon Sep 17 00:00:00 2001
From: Johannes Renner <jren...@suse.de>
Date: Mon, 12 Nov 2012 16:45:09 +0100
Subject: [PATCH] Fix typos
---
branding/css/blue-docs.css | 2 +-
.../src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/branding/css/blue-docs.css b/branding/css/blue-docs.css
index 1bec875..40909b2 100644
--- a/branding/css/blue-docs.css
+++ b/branding/css/blue-docs.css
@@ -139,7 +139,7 @@ pre,code,.guibutton,.keycap,.guilabel{font-size:0.9em;font-family:"liberation mo
.command .replaceable{color:#555;}
pre{display:block;background-color:#f7f2d0;color:#333;overflow:auto;}
pre code, code{white-space:normal;}
-pre.warning { padding: 1em; background-color: #d7d7d7; };
+pre.warning { padding: 1em; background-color: #d7d7d7; }
/*Notifications*/
div.note,div.tip ,div.important ,div.caution ,div.warning{
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index cb8b0a8..2e558d6 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -8242,7 +8242,7 @@ Please note that some manual configuration of these scripts may still be require
</context-group>
</trans-unit>
<trans-unit id="kickstart.jsp.error.template_message">
- <source>There are errors in your kickstart template. Please check the error message bellow.</source>
+ <source>There are errors in your kickstart template. Please check the error message below.</source>
<context-group name="ctx">
<context context-type="sourcefile">Kickstart Details</context>
</context-group>
--
1.7.10.4
_______________________________________________
Spacewalk-devel mailing list
Spacewalk-devel@redhat.com
https://www.redhat.com/mailman/listinfo/spacewalk-devel
