Skip to content

Commit c7d2276

Browse files
committed
(chocolatey#886) Made attribute name consistent with option
When originally merged in, the attribute was called CommandExecutionTimeoutSeconds, however, on reflection, the attribute name should match the option name for consistency. Although, using ExecutionTimeout rather than simply Timeout is more descriptive, so that variation of the name was chosen.
1 parent 3535232 commit c7d2276

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/chocolatey/infrastructure.app/commands/ChocolateyInstallCommand.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ Chocolatey Professional showing private download cache and virus scan
370370
<package id=""alloptions"" version=""0.1.1""
371371
source=""https://somewhere/api/v2/"" installArguments=""""
372372
packageParameters="""" forceX86=""false"" allowMultipleVersions=""false""
373-
ignoreDependencies=""false"" commandExecutionTimeoutSeconds=""1000"" force=""false""
373+
ignoreDependencies=""false"" executionTimeout=""1000"" force=""false""
374374
/>
375375
</packages>
376376

src/chocolatey/infrastructure.app/configuration/PackagesConfigFilePackageSetting.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ public sealed class PackagesConfigFilePackageSetting
6060
public bool Disabled { get; set; }
6161

6262
[System.ComponentModel.DefaultValue(-1)]
63-
[XmlAttribute(AttributeName = "commandExecutionTimeoutSeconds")]
64-
public int CommandExecutionTimeoutSeconds { get; set; }
63+
[XmlAttribute(AttributeName = "executionTimeout")]
64+
public int ExecutionTimeout { get; set; }
6565

6666
[XmlAttribute(AttributeName = "force")]
6767
public bool Force { get; set; }

src/chocolatey/infrastructure.app/services/ChocolateyPackageService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,7 @@ private IEnumerable<ChocolateyConfiguration> get_packages_from_config(string pac
738738
SourceType sourceType;
739739
if (Enum.TryParse(pkgSettings.Source, true, out sourceType)) packageConfig.SourceType = sourceType;
740740
if (pkgSettings.Force) packageConfig.Force = true;
741-
packageConfig.CommandExecutionTimeoutSeconds = pkgSettings.CommandExecutionTimeoutSeconds == -1 ? packageConfig.CommandExecutionTimeoutSeconds : pkgSettings.CommandExecutionTimeoutSeconds;
741+
packageConfig.CommandExecutionTimeoutSeconds = pkgSettings.ExecutionTimeout == -1 ? packageConfig.ExecutionTimeout : pkgSettings.CommandExecutionTimeoutSeconds;
742742
if (pkgSettings.Prerelease) packageConfig.Prerelease = true;
743743
if (pkgSettings.OverrideArguments) packageConfig.OverrideArguments = true;
744744
if (pkgSettings.NotSilent) packageConfig.NotSilent = true;

0 commit comments

Comments
 (0)