From: Richard W.M. Jones <rjones@redhat.com>
Date: Sat, 28 Sep 2013 07:13:39 +0000 (+0100)
Subject: Use onrun handler to perform memory_set.
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;ds=sidebyside;h=021989b3292957a6c4059a1fecb216c4219c40d9;p=goaljobs-goals.git

Use onrun handler to perform memory_set.

And fix a few places where we forgot to do memory_set.
---

diff --git a/libguestfs_upstream.ml b/libguestfs_upstream.ml
index 6180989..01b2a68 100644
--- a/libguestfs_upstream.ml
+++ b/libguestfs_upstream.ml
@@ -69,17 +69,18 @@ let rec goal website_updated version =
 and website_rsync_done version =
   let key = sprintf "libguestfs_website_rsync_done_%s" version.version in
   target (memory_exists key);
+  onrun (fun () -> memory_set key "1");
 
   sh "
     cd %s
     echo NOT RUNNING: . .rsync
-  " libguestfs_website_cvs;
-  memory_set key "1"
+  " libguestfs_website_cvs
 
 (* Goal: Tarball added to CVS and CVS checked in. *)
 and website_cvs_checked_in version =
   let key = sprintf "libguestfs_website_cvs_checked_in_%s" version.version in
   target (memory_exists key);
+  onrun (fun () -> memory_set key "1");
 
   require (tarball_created version);
   require (tarball_tested version);
@@ -127,6 +128,7 @@ and website_built version =
 and tarball_tested version =
   let key = sprintf "libguestfs_tarball_tested_%s" version.version in
   target (memory_exists key);
+  onrun (fun () -> memory_set key "1");
 
   require (tarball_created version);
 
@@ -183,6 +185,7 @@ and commit_tested branch commit =
 
   let key = sprintf "libguestfs_commit_tested_%s" commit in
   target (memory_exists key);
+  onrun (fun () -> memory_set key "1");
 
   let repodir = sprintf "%s/repos/%s-%s" buildtmp package branch in
   require (directory_exists repodir);
@@ -202,9 +205,7 @@ and commit_tested branch commit =
   " repodir
     commit
     (quote (libguestfs_localconfigure `Git))
-    (quote libguestfs_localenv);
-
-  memory_set key "1"
+    (quote libguestfs_localenv)
 
 (* Helper function to make a full 'info' object from a version
  * number.