-
Notifications
You must be signed in to change notification settings - Fork 909
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.
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
(GH-490) Exception if no source is enabled #547
Closed
+111
−4
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -107,6 +107,13 @@ public void list_noop(ChocolateyConfiguration config) | |
|
||
public IEnumerable<PackageResult> list_run(ChocolateyConfiguration config) | ||
{ | ||
if (config.Sources == null) | ||
{ | ||
this.Log().Error(ChocolateyLoggers.Important, @"Unable to search for packages when there are no sources enabled for packages."); | ||
Environment.ExitCode = 1; | ||
yield break; | ||
} | ||
|
||
if (config.RegularOutput) this.Log().Debug(() => "Searching for package information"); | ||
|
||
var packages = new List<IPackage>(); | ||
|
@@ -304,10 +311,18 @@ public ConcurrentDictionary<string, PackageResult> install_run(ChocolateyConfigu | |
{ | ||
this.Log().Info(@"Installing the following packages:"); | ||
this.Log().Info(ChocolateyLoggers.Important, @"{0}".format_with(config.PackageNames)); | ||
this.Log().Info(@"By installing you accept licenses for the packages."); | ||
|
||
var packageInstalls = new ConcurrentDictionary<string, PackageResult>(); | ||
|
||
if (config.Sources == null) | ||
{ | ||
this.Log().Error(ChocolateyLoggers.Important, @"Installation was NOT successful. There are no sources enabled for packages."); | ||
Environment.ExitCode = 1; | ||
return packageInstalls; | ||
} | ||
|
||
this.Log().Info(@"By installing you accept licenses for the packages."); | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I believe this is also necessary for upgrade_run. |
||
foreach (var packageConfig in set_config_from_package_names_and_packages_config(config, packageInstalls).or_empty_list_if_null()) | ||
{ | ||
Action<PackageResult> action = null; | ||
|
@@ -497,6 +512,14 @@ public ConcurrentDictionary<string, PackageResult> upgrade_run(ChocolateyConfigu | |
{ | ||
this.Log().Info(@"Upgrading the following packages:"); | ||
this.Log().Info(ChocolateyLoggers.Important, @"{0}".format_with(config.PackageNames)); | ||
|
||
if (config.Sources == null) | ||
{ | ||
this.Log().Error(ChocolateyLoggers.Important, @"Upgrading was NOT successful. There are no sources enabled for packages."); | ||
Environment.ExitCode = 1; | ||
return new ConcurrentDictionary<string, PackageResult>(); | ||
} | ||
|
||
this.Log().Info(@"By upgrading you accept licenses for the packages."); | ||
|
||
foreach (var packageConfigFile in config.PackageNames.Split(new[] { ApplicationParameters.PackageNamesSeparator }, StringSplitOptions.RemoveEmptyEntries).or_empty_list_if_null().Where(p => p.EndsWith(".config")).ToList()) | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍