@@ -345,9 +345,10 @@ func (c *InitCommand) getModules(path string, earlyRoot *tfconfig.Module, upgrad
 
 	installAbort, installDiags := c.installModules(path, upgrade, hooks)
 	diags = diags.Append(installDiags)
-	if installAbort || installDiags.HasErrors() {
-		return true, true, diags
-	}
+
+	// At this point, installModules may have generated error diags or been
+	// aborted by SIGINT. In any case we continue and the manifest as best
+	// we can.
 
 	// Since module installer has modified the module manifest on disk, we need
 	// to refresh the cache of it in the loader.
@@ -362,7 +363,7 @@ func (c *InitCommand) getModules(path string, earlyRoot *tfconfig.Module, upgrad
 		}
 	}
 
-	return true, false, diags
+	return true, installAbort, diags
 }
 
 func (c *InitCommand) initCloud(root *configs.Module) (be backend.Backend, output bool, diags tfdiags.Diagnostics) {
 
@@ -178,8 +178,6 @@ func (m *Meta) installModules(rootDir string, upgrade bool, hooks initwd.ModuleI
 		diags = diags.Append(fmt.Errorf("failed to create local modules directory: %s", err))
 		return true, diags
 	}
-	// FIXME: KEM: does returning the abort here change behaviour in a particular error
-	// case?
 
 	inst := m.moduleInstaller()
Original file line number	Diff line number	Diff line change
`@@ -345,9 +345,10 @@ func (c InitCommand) getModules(path string, earlyRoot tfconfig.Module, upgrad`
`345`	`345`
`346`	`346`	`installAbort, installDiags := c.installModules(path, upgrade, hooks)`
`347`	`347`	`diags = diags.Append(installDiags)`
`348`		`- if installAbort \|\| installDiags.HasErrors() {`
`349`		`- return true, true, diags`
`350`		`- }`
	`348`	`+`
	`349`	`+ // At this point, installModules may have generated error diags or been`
	`350`	`+ // aborted by SIGINT. In any case we continue and the manifest as best`
	`351`	`+ // we can.`
`351`	`352`
`352`	`353`	`// Since module installer has modified the module manifest on disk, we need`
`353`	`354`	`// to refresh the cache of it in the loader.`
`@@ -362,7 +363,7 @@ func (c InitCommand) getModules(path string, earlyRoot tfconfig.Module, upgrad`
`362`	`363`	`}`
`363`	`364`	`}`
`364`	`365`
`365`		`- return true, false, diags`
	`366`	`+ return true, installAbort, diags`
`366`	`367`	`}`
`367`	`368`
`368`	`369`	`func (c InitCommand) initCloud(root configs.Module) (be backend.Backend, output bool, diags tfdiags.Diagnostics) {`
Original file line number	Diff line number	Diff line change
`@@ -178,8 +178,6 @@ func (m *Meta) installModules(rootDir string, upgrade bool, hooks initwd.ModuleI`
`178`	`178`	`diags = diags.Append(fmt.Errorf("failed to create local modules directory: %s", err))`
`179`	`179`	`return true, diags`
`180`	`180`	`}`
`181`		`- // FIXME: KEM: does returning the abort here change behaviour in a particular error`
`182`		`- // case?`
`183`	`181`
`184`	`182`	`inst := m.moduleInstaller()`
`185`	`183`