X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libguestfs.ml;h=5cb806b41abae8938a024d48d2f117e846c00125;hb=5324bda8dbb31613640901bfba9b0dd339bc9616;hp=48da3eaa7c28bff3a8e9c2d1d829244be53f6358;hpb=6cf22731e0f8f5ceba442b0b7c50faa3589970eb;p=goaljobs-goals.git

diff --git a/libguestfs.ml b/libguestfs.ml
index 48da3ea..5cb806b 100644
--- a/libguestfs.ml
+++ b/libguestfs.ml
@@ -20,8 +20,8 @@ type info = {
   package_version : string;      (* package-version *)
   tarball : string;              (* package-version.tar.gz *)
   python_tarball : string;       (* guestfs-version.tar.gz *)
-  urlpath : string;              (* download/1.X-(stable|development)/tarball *)
-  python_urlpath : string;       (* download/python/python_tarball *)
+  urlpath : string;              (* libguestfs-download/1.X-(stable|development)/tarball *)
+  python_urlpath : string;       (* libguestfs-download/python/python_tarball *)
   url : string;                  (* full download URL of tarball *)
   python_url : string;           (* python sdist *)
 }
@@ -48,14 +48,14 @@ let vernames version =
       let tarball = sprintf "%s.tar.gz" package_version in
       let urlpath =
         if is_stable then
-          sprintf "download/%d.%d-stable/%s" major minor tarball
+          sprintf "%d.%d-stable/%s" major minor tarball
         else
-          sprintf "download/%d.%d-development/%s" major minor tarball in
-      let url = "http://libguestfs.org/" ^ urlpath in
+          sprintf "%d.%d-development/%s" major minor tarball in
+      let url = "http://download.libguestfs.org/" ^ urlpath in
       let python_tarball =
         sprintf "guestfs-%d.%d.%d.tar.gz" major minor release in
-      let python_urlpath = sprintf "download/python/" ^ python_tarball in
-      let python_url = "http://libguestfs.org/" ^ python_urlpath in
+      let python_urlpath = sprintf "python/" ^ python_tarball in
+      let python_url = "http://download.libguestfs.org/" ^ python_urlpath in
 
       { version = version;
         major = major; minor = minor; release = release;
@@ -130,7 +130,7 @@ let git_latest_commit branch =
 let website_latest_version =
   let rex = Str.regexp "libguestfs-\\(.*\\)\\.tar\\.gz" in
   fun branch ->
-    let wdir = libguestfs_website_repo // "download" // branch in
+    let wdir = libguestfs_download_repo // branch in
     let files = Sys.readdir wdir in
     let files = Array.to_list files in
     if files = [] then None