wip

Signed-off-by: Ibrahim AshShohail <[email protected]>

Author: ibrasho

cmd/dep/ensure.go

@@ -144,19 +144,19 @@ func (cmd *ensureCommand) Run(ctx *dep.Ctx, args []string) error {
 
 	solver, err := gps.Prepare(params, sm)
 	if err != nil {
-		return errors.Wrap(err, "ensure Prepare")
-	}
-
-	solution, err := solver.Solve()
-	if err != nil {
-		handleAllTheFailuresOfTheWorld(err)
 		if deduceErrs, ok := err.(gps.DeductionFailureErrs); ok {
 			ctx.Loggers.Err.Println("The following errors occurred while deducing packages:")
 			for ip, dErr := range deduceErrs {
 				ctx.Loggers.Err.Printf("  * \"%s\": %s", ip, dErr)
 			}
 			ctx.Loggers.Err.Println()
 		}
+		return errors.Wrap(err, "ensure Prepare")
+	}
+
+	solution, err := solver.Solve()
+	if err != nil {
+		handleAllTheFailuresOfTheWorld(err)
 		return errors.Wrap(err, "ensure Solve()")
 	}
 

internal/gps/hash_test.go

@@ -27,6 +27,13 @@ func TestHashInputs(t *testing.T) {
 
 	s, err := Prepare(params, newdepspecSM(fix.ds, nil))
 	if err != nil {
+		if deduceErrs, ok := err.(DeductionFailureErrs); ok {
+			t.Error("The following errors occurred while deducing packages:")
+			for ip, dErr := range deduceErrs {
+				t.Errorf("  * \"%s\": %s", ip, dErr)
+			}
+			t.Error()
+		}
 		t.Fatalf("Unexpected error while prepping solver: %s", err)
 	}
 
@@ -80,6 +87,13 @@ func TestHashInputsReqsIgs(t *testing.T) {
 
 	s, err := Prepare(params, newdepspecSM(fix.ds, nil))
 	if err != nil {
+		if deduceErrs, ok := err.(DeductionFailureErrs); ok {
+			t.Error("The following errors occurred while deducing packages:")
+			for ip, dErr := range deduceErrs {
+				t.Errorf("  * \"%s\": %s", ip, dErr)
+			}
+			t.Error()
+		}
 		t.Fatalf("Unexpected error while prepping solver: %s", err)
 	}
 
@@ -122,6 +136,13 @@ func TestHashInputsReqsIgs(t *testing.T) {
 
 	s, err = Prepare(params, newdepspecSM(fix.ds, nil))
 	if err != nil {
+		if deduceErrs, ok := err.(DeductionFailureErrs); ok {
+			t.Error("The following errors occurred while deducing packages:")
+			for ip, dErr := range deduceErrs {
+				t.Errorf("  * \"%s\": %s", ip, dErr)
+			}
+			t.Error()
+		}
 		t.Fatalf("Unexpected error while prepping solver: %s", err)
 	}
 
@@ -162,6 +183,13 @@ func TestHashInputsReqsIgs(t *testing.T) {
 
 	s, err = Prepare(params, newdepspecSM(fix.ds, nil))
 	if err != nil {
+		if deduceErrs, ok := err.(DeductionFailureErrs); ok {
+			t.Error("The following errors occurred while deducing packages:")
+			for ip, dErr := range deduceErrs {
+				t.Errorf("  * \"%s\": %s", ip, dErr)
+			}
+			t.Error()
+		}
 		t.Fatalf("Unexpected error while prepping solver: %s", err)
 	}
 
@@ -528,7 +556,15 @@ func TestHashInputsOverrides(t *testing.T) {
 
 		s, err := Prepare(params, newdepspecSM(basefix.ds, nil))
 		if err != nil {
-			t.Fatalf("(fix: %q) Unexpected error while prepping solver: %s", fix.name, err)
+			if deduceErrs, ok := err.(DeductionFailureErrs); ok {
+				t.Error("The following errors occurred while deducing packages:")
+				for ip, dErr := range deduceErrs {
+					t.Errorf("  * \"%s\": %s", ip, dErr)
+				}
+				t.Error()
+			}
+			t.Errorf("(fix: %q) Unexpected error while prepping solver: %s", fix.name, err)
+			continue
 		}
 
 		h := sha256.New()