add null or empty check for package version contents (#10561)

DynamoDS · Apr 13, 2020 · 41b8610 · 41b8610
1 parent 85c4120
commit 41b8610
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerClientViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerClientViewModel.cs
@@ -525,9 +525,15 @@ internal void ExecutePackageDownload(string name, PackageVersion version, string
 
                 // determine if any of the packages contain binaries or python scripts.  
                 var containsBinariesOrPythonScripts = dependencyVersionHeaders.Any(x =>
-                    x.contains_binaries ||
-                    x.contents.Contains(PackageManagerClient.PackageContainsBinariesConstant) ||
-                    x.contents.Contains(PackageManagerClient.PackageContainsPythonScriptsConstant));
+                {
+                    var are_contents_empty = string.IsNullOrEmpty(x.contents);
+                    var contains_binaries = x.contains_binaries ||
+                                            !are_contents_empty && x.contents.Contains(PackageManagerClient.PackageContainsBinariesConstant);
+                    var contains_python =
+                        !are_contents_empty && x.contents.Contains(PackageManagerClient.PackageContainsPythonScriptsConstant);
+                    return contains_binaries || contains_python;
+
+                });
 
                 // if any do, notify user and allow cancellation
                 if (containsBinariesOrPythonScripts)