Distinguish Vendored and Unvendored installs in logs

vanschelven · arjun024 · commit 7c842a7d0956 · 2022-11-08T10:39:33.000-05:00
diff --git a/src/python/supply/supply.go b/src/python/supply/supply.go
@@ -593,6 +593,8 @@ func (s *Supplier) UninstallUnusedDependencies() error {
 }
 
 func (s *Supplier) RunPipUnvendored() error {
+	s.Log.BeginStep("Running Pip Install (Unvendored)")
+
 	shouldContinue, requirementsPath, err := s.shouldRunPip()
 	if err != nil {
 		return err
@@ -652,6 +654,8 @@ func (s *Supplier) RunPipUnvendored() error {
 }
 
 func (s *Supplier) RunPipVendored() error {
+	s.Log.BeginStep("Running Pip Install (Vendored)")
+
 	shouldContinue, requirementsPath, err := s.shouldRunPip()
 	if err != nil {
 		return err
@@ -807,7 +811,6 @@ func writePyDistUtils(distUtils map[string][]string) error {
 }
 
 func (s *Supplier) shouldRunPip() (bool, string, error) {
-	s.Log.BeginStep("Running Pip Install")
 	if os.Getenv("PIP_CERT") == "" {
 		os.Setenv("PIP_CERT", "/etc/ssl/certs/ca-certificates.crt")
 	}

Original file line number	Diff line number	Diff line change
`@@ -593,6 +593,8 @@ func (s *Supplier) UninstallUnusedDependencies() error {`
`593`	`593`	`}`
`594`	`594`
`595`	`595`	`func (s *Supplier) RunPipUnvendored() error {`
	`596`	`+ s.Log.BeginStep("Running Pip Install (Unvendored)")`
	`597`	`+`
`596`	`598`	`shouldContinue, requirementsPath, err := s.shouldRunPip()`
`597`	`599`	`if err != nil {`
`598`	`600`	`return err`
`@@ -652,6 +654,8 @@ func (s *Supplier) RunPipUnvendored() error {`
`652`	`654`	`}`
`653`	`655`
`654`	`656`	`func (s *Supplier) RunPipVendored() error {`
	`657`	`+ s.Log.BeginStep("Running Pip Install (Vendored)")`
	`658`	`+`
`655`	`659`	`shouldContinue, requirementsPath, err := s.shouldRunPip()`
`656`	`660`	`if err != nil {`
`657`	`661`	`return err`
`@@ -807,7 +811,6 @@ func writePyDistUtils(distUtils map[string][]string) error {`
`807`	`811`	`}`
`808`	`812`
`809`	`813`	`func (s *Supplier) shouldRunPip() (bool, string, error) {`
`810`		`- s.Log.BeginStep("Running Pip Install")`
`811`	`814`	`if os.Getenv("PIP_CERT") == "" {`
`812`	`815`	`os.Setenv("PIP_CERT", "/etc/ssl/certs/ca-certificates.crt")`
`813`	`816`	`}`