From: Richard W.M. Jones <rjones@redhat.com>
Date: Sat, 28 Sep 2013 11:22:40 +0000 (+0100)
Subject: Enable uploading.
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=ff86e5997ace60bf9cb4a70aee7142694474686c;hp=1176fdbc7e636a9597e2294fef5574f2cd44f93e;p=goaljobs-goals.git

Enable uploading.
---

diff --git a/libguestfs_upstream.ml b/libguestfs_upstream.ml
index eb6806e..4c32dfd 100644
--- a/libguestfs_upstream.ml
+++ b/libguestfs_upstream.ml
@@ -67,13 +67,12 @@ let rec goal website_updated version =
 
 (* Goal: website has been rsync'd. *)
 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");
+  target (url_contains_string "http://libguestfs.org" version.version &&
+          url_exists version.url);
 
   sh "
     cd %s
-    echo NOT RUNNING: . .rsync
+    ./.rsync
   " libguestfs_website_cvs
 
 (* Goal: Tarball added to CVS and CVS checked in. *)
@@ -88,8 +87,8 @@ and website_cvs_checked_in version =
   sh "
     cd %s
     cp %s/tarballs/%s %s
-    echo NOT RUNNING: cvs add -kb %s
-    echo NOT RUNNING: cvs ci -m \"Version %s\"
+    cvs add -kb %s
+    cvs ci -m \"Version %s\"
   " libguestfs_website_cvs
     buildtmp version.tarball version.urlpath
     version.urlpath