From 51d1b9ae5c4e10287ab66c52d90389036c8267e4 Mon Sep 17 00:00:00 2001 From: MaksimZhukov Date: Thu, 2 Jul 2020 15:21:49 +0300 Subject: [PATCH] Fix comments --- get-new-tool-versions/get-new-tool-versions.Tests.ps1 | 1 - get-new-tool-versions/get-new-tool-versions.ps1 | 5 +++++ get-new-tool-versions/helpers.psm1 | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/get-new-tool-versions/get-new-tool-versions.Tests.ps1 b/get-new-tool-versions/get-new-tool-versions.Tests.ps1 index 3d5e9c1..f16728b 100644 --- a/get-new-tool-versions/get-new-tool-versions.Tests.ps1 +++ b/get-new-tool-versions/get-new-tool-versions.Tests.ps1 @@ -14,7 +14,6 @@ Describe "Validate-FiltersFormat" { It "Valid filters" { { Validate-FiltersFormat -Filters @("*", "1", "1.*", "1.2", "1.2.*") } | Should -Not -Throw "Invalid filter format" } - } Describe "Format-Versions" { diff --git a/get-new-tool-versions/get-new-tool-versions.ps1 b/get-new-tool-versions/get-new-tool-versions.ps1 index 60952e6..f95984a 100644 --- a/get-new-tool-versions/get-new-tool-versions.ps1 +++ b/get-new-tool-versions/get-new-tool-versions.ps1 @@ -49,6 +49,11 @@ $formattedVersions = Select-VersionsByFilter -Versions $formattedVersions ` -IncludeFilters $VersionFilterToInclude ` -ExcludeFilters $VersionFilterToExclude +if (-not $formattedVersions) { + Write-Host "Couldn't find available versions with current filters" + exit 1 +} + $versionsToBuild = Skip-ExistingVersions -VersionsFromManifest $versionsFromManifest ` -VersionsFromDist $formattedVersions diff --git a/get-new-tool-versions/helpers.psm1 b/get-new-tool-versions/helpers.psm1 index 7b5af82..2f9d582 100644 --- a/get-new-tool-versions/helpers.psm1 +++ b/get-new-tool-versions/helpers.psm1 @@ -59,7 +59,7 @@ function Select-VersionsByFilter { $ver = $_ $matchedIncludeFilters = $IncludeFilters | Where-Object { $ver -like $_ } $matchedExcludeFilters = $ExcludeFilters | Where-Object { $ver -like $_ } - return ($null -ne $matchedIncludeFilters) -and ($null -eq $matchedExcludeFilters) + $matchedIncludeFilters -and (-not $matchedExcludeFilters) } }