Merge branch 'stable'

* stable: (version) 0.9.9 (chocolateyGH-139) Get-WebFile - prevent error loop (doc) update changelog/nuspec
Jaykul · Mar 3, 2015 · 9567a91 · 9567a91
2 parents 8d4eef0 + a318644
commit 9567a91
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.uppercut b/.uppercut
@@ -18,7 +18,7 @@
   <property name="version.major" value="0" overwrite="false" />
   <property name="version.minor" value="9" overwrite="false" />
   <property name="version.patch" value="9" overwrite="false" />
-  <property name="version.nuget.prerelease" value="rc9" overwrite="false" />
+  <property name="version.nuget.prerelease" value="" overwrite="false" />
   <property name="version.use.build_date" value="false" overwrite="false" />
   <property name="assembly.description" value="${project.name} is a product of ${company.name} - All Rights Reserved." overwrite="false" />
   <property name="assembly.copyright" value="Copyright © 2011 - Present, ${company.name} - All Rights Reserved." overwrite="false" />

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## [0.9.9](https://github.com/chocolatey/choco/issues?q=is%3Aissue+milestone%3A0.9.9+is%3Aclosed) (unreleased)
+## [0.9.9](https://github.com/chocolatey/choco/issues?q=is%3Aissue+milestone%3A0.9.9+is%3Aclosed) (March 3, 2015)
 
 This also includes issues that were being tracked in the old Chocolatey repository: [Chocolatey 0.9.9](https://github.com/chocolatey/chocolatey/issues?q=is%3Aclosed+label%3Av0.9.9).
 
@@ -39,7 +39,6 @@ We'll try to capture everything here that you should know about. Please call `ch
    2. `choco version` has been deprecated and will be removed in v1. Use `choco upgrade pkgName --noop` or `choco upgrade pkgName -whatif` instead.
    3. `Write-ChocolateySuccess`, `Write-ChocolateyFailure` have been deprecated.
    4. `update` is now `upgrade`. `update` has been deprecated and will be removed/replaced in v1. Update will be reincarnated later for a different purpose. **Hint**: It rhymes with smackage pindexes.
- * PowerShell - Ensure all errors are terminating errors - see [#48](https://github.com/chocolatey/choco/issues/48)
 
 ### FEATURES
 

diff --git a/nuget/chocolatey/chocolatey.nuspec b/nuget/chocolatey/chocolatey.nuspec
@@ -81,7 +81,6 @@ We'll try to capture everything here that you should know about. Please call `ch
    2. `choco version` has been deprecated and will be removed in v1. Use `choco upgrade pkgName --noop` or `choco upgrade pkgName -whatif` instead.
    3. `Write-ChocolateySuccess`, `Write-ChocolateyFailure` have been deprecated.
    4. `update` is now `upgrade`. `update` has been deprecated and will be removed/replaced in v1. Update will be reincarnated later for a different purpose. **Hint**: It rhymes with smackage pindexes.
- * PowerShell - Ensure all errors are terminating errors - see [#48](https://github.com/chocolatey/choco/issues/48)
 
 ### FEATURES
 

diff --git a/src/chocolatey.resources/helpers/functions/Get-WebFile.ps1 b/src/chocolatey.resources/helpers/functions/Get-WebFile.ps1
@@ -99,7 +99,11 @@ param(
         [System.IO.Directory]::CreateDirectory($fileDirectory) | Out-Null  
       }
 
-      $writer = new-object System.IO.FileStream $fileName, "Create"
+	  try {
+	     $writer = new-object System.IO.FileStream $fileName, "Create"
+	  } catch {
+		throw $_.Exception
+	  }
     }
     [byte[]]$buffer = new-object byte[] 1048576
     [long]$total = [long]$count = [long]$iterLoop =0