fix merge

tgauth · web-flow · commit 27b69f6fa37d · 2024-06-06T16:40:00.000-04:00
diff --git a/dsc_lib/src/dscresources/command_resource.rs b/dsc_lib/src/dscresources/command_resource.rs
@@ -186,7 +186,7 @@ pub fn invoke_set(resource: &ResourceManifest, cwd: &str, desired: &str, skip_te
         },
     }
 
-    info!("Invoking {} '{}' using '{}'", &resource.resource_type, &set.executable);
+    info!("Invoking {} '{}' using '{}'", operation_type, &resource.resource_type, &set.executable);
     let (exit_code, stdout, stderr) = invoke_command(&set.executable, args, input_desired, Some(cwd), env, &resource.exit_codes)?;
 
     match set.returns {

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ pub fn invoke_set(resource: &ResourceManifest, cwd: &str, desired: &str, skip_te`
`186`	`186`	`},`
`187`	`187`	`}`
`188`	`188`
`189`		`- info!("Invoking {} '{}' using '{}'", &resource.resource_type, &set.executable);`
	`189`	`+ info!("Invoking {} '{}' using '{}'", operation_type, &resource.resource_type, &set.executable);`
`190`	`190`	`let (exit_code, stdout, stderr) = invoke_command(&set.executable, args, input_desired, Some(cwd), env, &resource.exit_codes)?;`
`191`	`191`
`192`	`192`	`match set.returns {`