This on top of Chris' latest patch works nicely.

This fixes the bt/segfault I was getting and adds the final result of
the quota call to the logging.

Signed-off-by: Ian Main <[email protected]>
---
 src/classad_plugin/deltacloud_classad_plugin.cpp |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/classad_plugin/deltacloud_classad_plugin.cpp 
b/src/classad_plugin/deltacloud_classad_plugin.cpp
index aa2ff60..dc79cbb 100644
--- a/src/classad_plugin/deltacloud_classad_plugin.cpp
+++ b/src/classad_plugin/deltacloud_classad_plugin.cpp
@@ -105,7 +105,7 @@ deltacloud_quota_check(const char *name, const ArgumentList 
&arglist,
              "   ret = false\n"
              "end\n"
              "logf.close\n"
-             "return ret",
+             "ret",
              DELTACLOUD_INSTALL_DIR,
              DELTACLOUD_INSTALL_DIR,
              LOGFILE,
@@ -124,11 +124,11 @@ deltacloud_quota_check(const char *name, const 
ArgumentList &arglist,
      */
     //ruby_finalize();
 
+    fprintf(fp, "Returned result from ruby code was %s\n", (res == Qtrue) ? 
"true" : "false");
+
     if (res == Qtrue) {
         result.SetBooleanValue(true);
         val = true;
-    } else {
-        fprintf(fp, "Returned result from ruby code was %s\n", (res == Qtrue) 
? "true" : "false");
     }
 
  do_ret:
-- 
1.7.1.1

_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel

Reply via email to