X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libguestfs_fedora.ml;h=1dcb4762b2bf5a905ec466ac09209cbce61edd2d;hb=bc17e2b88f3bf8a78750531b8658c3d931a02791;hp=c101613c1b8cbfd4bc18bdad5d468873b3343383;hpb=d561a25015bb195b483cb22b1167074c17611997;p=goaljobs-goals.git

diff --git a/libguestfs_fedora.ml b/libguestfs_fedora.ml
index c101613..1dcb476 100644
--- a/libguestfs_fedora.ml
+++ b/libguestfs_fedora.ml
@@ -22,10 +22,10 @@ let package = "libguestfs"
 
 (* How branches in libguestfs upstream map to branches in Fedora. *)
 let branches = [
-  "1.29-development", "master";    (* Rawhide follows development. *)
-  "1.29-development", "f22";       (* F22 follows development (for now). *)
-  "1.28-stable", "f21";            (* F21 follows 1.28. *)
-  "1.26-stable", "f20";            (* F20 follows 1.26. *)
+  "1.37-development", "master";    (* Rawhide follows development. *)
+  "1.36-stable", "f26";            (* F26 follows 1.36. *)
+  "1.36-stable", "f25";            (* F25 follows 1.36. *)
+  "1.34-stable", "f24";            (* F24 follows 1.34. *)
 ]
 
 (* Goal: Latest website version has been built in every branch. *)
@@ -66,7 +66,7 @@ and sources_uploaded version branch =
   sh "
     cd %s
     fedpkg new-sources %s/%s
-  " repodir libguestfs_website_repo version.urlpath
+  " repodir libguestfs_download_repo version.urlpath
 
 and specfile_updated version branch =
   let repodir = fedora_repo package branch in
@@ -94,7 +94,8 @@ and specfile_updated version branch =
 
 and specfile_committed version branch =
   let repodir = fedora_repo package branch in
-  let key = sprintf "libguestfs_fedora_specfile_committed_%s" version.version in
+  let key = sprintf "libguestfs_fedora_specfile_committed_%s_%s"
+    branch version.version in
 
   target (memory_exists key);
   onrun (fun () -> memory_set key "1");
@@ -108,7 +109,8 @@ and specfile_committed version branch =
 
 and specfile_pushed version branch =
   let repodir = fedora_repo package branch in
-  let key = sprintf "libguestfs_fedora_specfile_pushed_%s" version.version in
+  let key =
+    sprintf "libguestfs_fedora_specfile_pushed_%s_%s" branch version.version in
 
   target (memory_exists key);
   onrun (fun () -> memory_set key "1");