Merge branch 'npm-login' of https://github.com/sverdlov93/jfrog-cli-core

into npm-login # Conflicts: # artifactory/commands/dotnet/dotnetcommand_test.go
jfrog · Jan 8, 2025 · e193963 · e193963
2 parents b515800 + 17f4f5f
commit e193963
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -42,6 +42,7 @@ jobs:
         uses: pnpm/action-setup@v4
         with:
           version: 9
+
       # Install Mono on Ubuntu to run nuget.exe (due to this issue on Ubuntu 24 that hasn't been fixed yet - https://github.com/NuGet/setup-nuget/issues/168)
       - name: Install Mono on Ubuntu
         if: matrix.os == 'ubuntu'

diff --git a/artifactory/commands/dotnet/dotnetcommand.go b/artifactory/commands/dotnet/dotnetcommand.go
@@ -214,7 +214,7 @@ func RemoveSourceFromNugetConfigIfExists(cmdType dotnet.ToolchainType, customCon
 		if strings.Contains(stdOut+stdErr, "Unable to find") || strings.Contains(stdOut+stdErr, "does not exist") {
 			return nil
 		}
-		return fmt.Errorf("failed to remove source: %w\n%s", err, strings.TrimSpace(stdOut+stdErr))
+		return errorutils.CheckErrorf("failed to remove source: %w\n%s\n%s", err, strings.TrimSpace(stdOut), strings.TrimSpace(stdErr))
 	}
 	return nil
 }