Make F22 and F23 follow 1.30

[goaljobs-goals.git] / libguestfs_fedora.ml

diff --git a/libguestfs_fedora.ml b/libguestfs_fedora.ml
index c101613..29b1201 100644 (file)
--- a/libguestfs_fedora.ml
+++ b/libguestfs_fedora.ml
@@ -22,8 +22,9 @@ 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.31-development", "master";    (* Rawhide follows development. *)
+  "1.30-stable", "f23";            (* F23 follows 1.30. *)
+  "1.30-stable", "f22";            (* F22 follows 1.30. *)
   "1.28-stable", "f21";            (* F21 follows 1.28. *)
   "1.26-stable", "f20";            (* F20 follows 1.26. *)
 ]
@@ -94,7 +95,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 +110,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");