Fix download of outdated files - fixes fsprojects#876

telefunkenvf14 · Jun 16, 2015 · e29012a · e29012a
1 parent 25a7015
commit e29012a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+#### 1.14.1 - 16.06.2015
+* Fix download of outdated files - https://github.com/fsprojects/Paket/issues/876
+
 #### 1.14.0 - 14.06.2015
 * Chocolatey support for Paket.PowerShell - https://github.com/fsprojects/Paket/pull/872
 * BUGFIX: Single version in deps file created invalid dependend package- https://github.com/fsprojects/Paket/issues/871

diff --git a/src/Paket.Core/Releases.fs b/src/Paket.Core/Releases.fs
@@ -25,29 +25,35 @@ let private download version (file:FileInfo) client =
         do! downloadFileSync url file.FullName client
     }
 
-let private doesNotExistsOrIsNewer (file:FileInfo) latest =
-    if (not <| file.Exists) then true
-    else
-        let verInfo = FileVersionInfo.GetVersionInfo file.FullName
-        let currentVersion = SemVer.Parse verInfo.FileVersion
-        currentVersion < latest
+let private doesNotExistsOrIsNewer (file : FileInfo) latest = 
+    if not file.Exists then true else 
+    let verInfo = FileVersionInfo.GetVersionInfo file.FullName
+    if verInfo = null || verInfo.FileVersion = null then false else
+    let currentVersion = SemVer.Parse verInfo.FileVersion
+    currentVersion < latest
 
 /// Downloads the latest version of the given files to the destination dir
-let downloadLatestVersionOf files destDir =
+let private downloadLatestVersionOf files destDir =
     use client = createWebClient(Constants.GithubUrl, None)
 
     trial {
         let! data = client |> downloadStringSync Constants.GithubReleasesUrl
         let! latestVersion = getLatestVersionFromJson data
 
-        let! downloads = 
+        let files =
             files
             |> List.map (fun file -> FileInfo(Path.Combine(destDir, file)))
-            |> List.filter (fun file -> doesNotExistsOrIsNewer file latestVersion)
+
+        let isOudated =
+            files
+            |> List.exists (fun file -> doesNotExistsOrIsNewer file latestVersion)
+
+        let! downloads =
+            if isOudated then files else []
             |> List.map (fun file -> download latestVersion file client)
             |> collect
 
-        ignore downloads
+        ()
     }
 
 /// Downloads the latest version of the paket.bootstrapper to the .paket dir