Merge branch 'stable'

* stable: (maint) match casing for directory override args (version) 0.9.10.3 (GH-808) type is string, not statements update CHANGELOG/nuspec (maint) RemovePendingPackagesTask 2 constructors
chocolatey · Jun 23, 2016 · 04c5e12 · 04c5e12
2 parents a10d936 + 89353b1
commit 04c5e12
Show file tree

Hide file tree

Showing 6 changed files with 43 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="10" overwrite="false" />
-  <property name="version.fix" value="2" overwrite="false" />
+  <property name="version.fix" value="3" 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" />

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,19 @@
+## [0.9.10.3](https://github.com/chocolatey/choco/issues?q=milestone%3A0.9.10.3+is%3Aclosed) (June 23, 2016)
+
+### BUG FIXES
+
+ * Fix - Ignore ValidPackage Exit Codes for Real - see [#827](https://github.com/chocolatey/choco/issues/827)
+ * Fix - Cache folder running under SYSTEM account should be C:\Windows\TEMP - see [#826](https://github.com/chocolatey/choco/issues/826)
+ * Fix - Built-in 7zip doesn't behave properly - see [#775](https://github.com/chocolatey/choco/issues/775)
+ * Fix - Successful installer exit codes not recognized by choco should return 0 - see [#821](https://github.com/chocolatey/choco/issues/821)
+ * Fix - NotSilent fails with "Cannot bind argument to parameter statements because it is an empty string" - see [#819](https://github.com/chocolatey/choco/issues/819)
+ * Fix - Silent Args being passed as a string array cause package failure - see [#808](https://github.com/chocolatey/choco/issues/808)
+
+### IMPROVEMENTS
+
+ * Hold pending check for 10 seconds / provide means of explicitly overriding the transactional install cleanup - see [#822](https://github.com/chocolatey/choco/issues/822)
+ * Pro/Business - Add runtime skip option to allow skipping the virus scanner - see [#786](https://github.com/chocolatey/choco/issues/786)
+
 ## [0.9.10.2](https://github.com/chocolatey/choco/issues?q=milestone%3A0.9.10.2+is%3Aclosed) (June 19, 2016)
 
 ### BUG FIXES

diff --git a/nuget/chocolatey/chocolatey.nuspec b/nuget/chocolatey/chocolatey.nuspec
@@ -55,6 +55,23 @@ In that mess there is a link to the [PowerShell Chocolatey module reference](htt
     <releaseNotes>
 See all - https://github.com/chocolatey/choco/blob/stable/CHANGELOG.md
 
+## 0.9.10.3
+
+### BUG FIXES
+
+ * Fix - Ignore ValidPackage Exit Codes for Real - see [#827](https://github.com/chocolatey/choco/issues/827)
+ * Fix - Cache folder running under SYSTEM account should be C:\Windows\TEMP - see [#826](https://github.com/chocolatey/choco/issues/826)
+ * Fix - Built-in 7zip doesn't behave properly - see [#775](https://github.com/chocolatey/choco/issues/775)
+ * Fix - Successful installer exit codes not recognized by choco should return 0 - see [#821](https://github.com/chocolatey/choco/issues/821)
+ * Fix - NotSilent fails with "Cannot bind argument to parameter statements because it is an empty string" - see [#819](https://github.com/chocolatey/choco/issues/819)
+ * Fix - Silent Args being passed as a string array cause package failure - see [#808](https://github.com/chocolatey/choco/issues/808)
+
+### IMPROVEMENTS
+
+ * Hold pending check for 10 seconds / provide means of explicitly overriding the transactional install cleanup - see [#822](https://github.com/chocolatey/choco/issues/822)
+ * Pro/Business - Add runtime skip option to allow skipping the virus scanner - see [#786](https://github.com/chocolatey/choco/issues/786)
+
+
 ## 0.9.10.2
 
 ### BUG FIXES

diff --git a/src/chocolatey.resources/helpers/functions/Install-ChocolateyInstallPackage.ps1 b/src/chocolatey.resources/helpers/functions/Install-ChocolateyInstallPackage.ps1
@@ -184,10 +184,10 @@ param(
   if ($additionalInstallArgs -eq $null) {
     $additionalInstallArgs = '';
   } else {
-    if ($additionalInstallArgs -match 'installdir' -or `
-      $additionalInstallArgs -match 'targetdir' -or `
+    if ($additionalInstallArgs -match 'INSTALLDIR' -or `
+      $additionalInstallArgs -match 'TARGETDIR' -or `
       $additionalInstallArgs -match 'dir\=' -or `
-      $additionalInstallArgs -match '\/d\='
+      $additionalInstallArgs -match '\/D\='
     ) {
 @"
 Pro / Business supports a single, ubiquitous install directory option.

diff --git a/src/chocolatey.resources/helpers/functions/Start-ChocolateyProcessAsAdmin.ps1 b/src/chocolatey.resources/helpers/functions/Start-ChocolateyProcessAsAdmin.ps1
@@ -85,7 +85,8 @@ param(
   [parameter(Mandatory=$false)] $validExitCodes = @(0),
   [parameter(ValueFromRemainingArguments = $true)][Object[]] $ignoredArguments
 )
-  [statements]$statements = $statements -join ' '
+  [string]$statements = $statements -join ' '
+
   Write-Debug "Running 'Start-ChocolateyProcessAsAdmin' with exeToRun:`'$exeToRun`', statements: `'$statements`' ";
 
   $wrappedStatements = $statements

diff --git a/src/chocolatey/infrastructure.app/tasks/RemovePendingPackagesTask.cs b/src/chocolatey/infrastructure.app/tasks/RemovePendingPackagesTask.cs
@@ -34,6 +34,10 @@ public class RemovePendingPackagesTask : ITask
         private const int PENDING_FILE_AGE_SECONDS = 10;
         private const string PENDING_SKIP_FILE = ".chocolateyPendingSkip";
 
+        public RemovePendingPackagesTask(IFileSystem fileSystem) : this(fileSystem, new SystemDateTimeUtcService())
+        {
+        }
+
         public RemovePendingPackagesTask(IFileSystem fileSystem, IDateTimeService dateTimeService)
         {
             _fileSystem = fileSystem;