Use installed goaljobs package.

[goaljobs-goals.git] / libguestfs_upstream.ml

diff --git a/libguestfs_upstream.ml b/libguestfs_upstream.ml
index a3450eb..0d41d33 100644 (file)
--- a/libguestfs_upstream.ml
+++ b/libguestfs_upstream.ml
@@ -135,6 +135,13 @@ and tarball_created version =
 
   let repodir = sprintf "%s/repos/%s-%s" buildtmp package version.branch in
 
+  (* Branches <= 1.32 are tagged with "1.32.11",
+   * branches >= 1.33 are tagged with "v1.33.11".
+   *)
+  let version_tag =
+    if version.minor >= 33 then "v" ^ version.version
+    else version.version in
+
   sh "
     cp -a %s libguestfs
     cd libguestfs
@@ -160,7 +167,7 @@ and tarball_created version =
 
     mv %s %s/tarballs/%s
   " repodir
-    version.version
+    version_tag
     (quote (libguestfs_localconfigure `Git))
     (quote (libguestfs_localenv (supermin version)))
     version.tarball