X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libguestfs_fedora.ml;h=07c49d7d84d5027bcca4a917fdfbeee95f63c8e4;hb=73d7b030c6e27c4da25af235c8be04ae5521b617;hp=2cfd8cb7598d9a07c2a616188d26429749a164a2;hpb=b51ea8dcf9941ddc1198b6f684b9e397073a4a3a;p=goaljobs-goals.git

diff --git a/libguestfs_fedora.ml b/libguestfs_fedora.ml
index 2cfd8cb..07c49d7 100644
--- a/libguestfs_fedora.ml
+++ b/libguestfs_fedora.ml
@@ -22,12 +22,10 @@ let package = "libguestfs"
 
 (* How branches in libguestfs upstream map to branches in Fedora. *)
 let branches = [
-  "1.26-stable", "f20";            (* F20 follows 1.26. *)
-  "1.28-stable", "f21";            (* F21 follows 1.28. *)
-  "1.30-stable", "f22";            (* F22 follows 1.30. *)
-  "1.32-stable", "f23";            (* F23 follows 1.32. *)
-  "1.33-development", "f24";       (* F24 follows development, for now. *)
-  "1.33-development", "master";    (* Rawhide follows development. *)
+  "1.39-development", "master";    (* Rawhide follows development. *)
+  "1.39-development", "f29";       (* F29 follows development. *)
+  "1.38-stable", "f28";            (* F28 follows 1.38. *)
+  "1.38-stable", "f27";            (* F27 follows 1.38. *)
 ]
 
 (* Goal: Latest website version has been built in every branch. *)
@@ -65,10 +63,19 @@ and sources_uploaded version branch =
 
   require (repodir_up_to_date repodir);
 
-  sh "
-    cd %s
-    fedpkg new-sources %s/%s
-  " repodir libguestfs_website_repo version.urlpath
+  if not version.is_stable then (
+    sh "
+      cd %s
+      fedpkg new-sources %s/%s
+    " repodir libguestfs_download_repo version.urlpath
+  ) else (
+    sh "
+      cd %s
+      fedpkg new-sources %s/%s %s/%s.sig
+    "  repodir
+       libguestfs_download_repo version.urlpath
+       libguestfs_download_repo version.urlpath
+  )
 
 and specfile_updated version branch =
   let repodir = fedora_repo package branch in