Skip to content

Try to report better error when file is blocked by Firewall #1155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
forki merged 1 commit into from
Oct 20, 2015
+40 −2
Merged

Try to report better error when file is blocked by Firewall #1155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/Paket.Core/NuGetV2.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,8 +393,19 @@ let ExtractPackage(fileName:string, targetFolder, packageName:PackageName, versi
else
Directory.CreateDirectory(targetFolder) |> ignore

fixArchive fileName
ZipFile.ExtractToDirectory(fileName, targetFolder)
try
fixArchive fileName
ZipFile.ExtractToDirectory(fileName, targetFolder)
with
| exn ->
let text = ref ""
try
text := File.ReadAllText(fileName)
with
| _ -> ()

let text = if !text = "" then "" else sprintf " Package contains text: %s%s" !text Environment.NewLine
failwithf "Error during extraction of %s.%s%s Message: %s" (Path.GetFullPath fileName) Environment.NewLine text exn.Message

// cleanup folder structure
let rec cleanup (dir : DirectoryInfo) =
Expand Down
26 changes: 26 additions & 0 deletions tests/Paket.Tests/ExtractPackageSpecs.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
module Paket.ExtractPackageSpecs

open System.IO
open Paket
open NUnit.Framework
open FsUnit
open System
open System.Net
open Domain

[<Test>]
let ``should report blocked download``() =
let di = Path.Combine(Path.GetTempPath(),"PaketTests/Extract")
if Directory.Exists di then
Directory.Delete(di,true)
Directory.CreateDirectory(di) |> ignore
let fileName = Path.Combine(di,"FSharp.Data.nupkg")
File.Copy("Nuspec/FSharp.Data.nuspec",fileName)

try
NuGetV2.ExtractPackage(fileName,di,PackageName "FSharp.Data",SemVer.Parse("0.1.1"))
|> Async.RunSynchronously

with
| exn -> exn.Message
|> fun error -> error.Contains("Package contains text:") |> shouldEqual true
1 change: 1 addition & 0 deletions tests/Paket.Tests/Paket.Tests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
<Compile Include="NugetVersionRangeSerializerSpecs.fs" />
<Compile Include="DependencySetSpecs.fs" />
<Compile Include="BindingRedirect.fs" />
<Compile Include="ExtractPackageSpecs.fs" />
<Compile Include="UtilsSpecs.fs" />
<Compile Include="TemplateFileParsing.fs" />
<Compile Include="NuspecWriterSpecs.fs" />
Expand Down