Attachment 926074 Details for Bug 883203 – proposed fix; removes rlAssertRpm if RunFor is 'None'

[patch] proposed fix; removes rlAssertRpm if RunFor is 'None'

beaker-wizard-RFE-None.patch (text/plain), 1.33 KB, created by Martin Žember on 2014-08-12 13:47:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Žember

Created: 2014-08-12 13:47:34 UTC

Size: 1.33 KB

patch

obsolete

>diff --git a/Client/src/bkr/client/wizard.py b/Client/src/bkr/client/wizard.py
>index 61407dc..51afc42 100755
>--- a/Client/src/bkr/client/wizard.py
>+++ b/Client/src/bkr/client/wizard.py
>@@ -2458,6 +2458,14 @@ def replaceVariables(self, xml, test = None):
>                     skeleton += value
>         return skeleton
> 
>+    def modifySkeletonText(self, skeletonText, test):
>+        """ Modify skeleton text, e.g. remove "   rlAssertRpm $PACKAGE" if package is 'None' """
>+        if test == None:
>+            return skeletonText
>+        if test.runfor.show() == 'None':
>+            skeletonText = re.sub('\n\s*rlAssertRpm \$PACKAGE\n', '\n', skeletonText)
>+        return skeletonText
>+
>     def getRuntest(self, test = None):
>         """ Return runtest.sh skeleton corresponding to user choice """
>         # get the template from predefined or user skeletons
>@@ -2465,6 +2473,8 @@ def getRuntest(self, test = None):
>                 or findNode(self.options.pref.skeletons, "skeleton", self.data)
>         # substitute variables, convert to plain text
>         skeleton = self.replaceVariables(skeleton, test)
>+        # modify it if needed
>+        skeleton = self.modifySkeletonText(skeleton, test)
>         # return dedented skeleton without trailing whitespace
>         skeleton = re.sub("\n\s+$", "\n", skeleton)
>         return dedentText(skeleton)

Actions: View | Diff

Attachments on bug 883203: 926074