[Xen-devel] [OSSTEST PATCH] Osstest.pm: Fix main_revision_job_cond after 0964bab7a9ea

Ian Jackson posted 1 patch 4 years, 6 months ago
Failed in applying to current master (apply log)
Osstest.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[Xen-devel] [OSSTEST PATCH] Osstest.pm: Fix main_revision_job_cond after 0964bab7a9ea
Posted by Ian Jackson 4 years, 6 months ago
In
  other_revision_job_suffix: Take and pass referring runvar name
we updated main_revision_job_cond to pass a dummy 'x' for the new
parameter.  But the parameter is a sql expression, not a value,
and so an extra pair of quotes are needed.

This error broke sg-check-tested and this fix fixes it.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 Osstest.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Osstest.pm b/Osstest.pm
index c14531e3..d6c1b709 100644
--- a/Osstest.pm
+++ b/Osstest.pm
@@ -388,7 +388,7 @@ END
 
 sub main_revision_job_cond ($) {
     my ($jobfield) = @_;
-    return "(${\ other_revision_job_suffix($jobfield,'x','x') } = '')";
+    return "(${\ other_revision_job_suffix($jobfield,\"'x'\",'x') } = '')";
 }
 
 sub get_harness_rev () {
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel