muvm: move prepare_env_vars up

slp · slp · commit 92e39e7f65f5 · 2024-11-06T19:32:45.000+01:00
Move prepare_env_vars up in the main function, since in the next commit
we're going to need the vector to be available earlier.

Signed-off-by: Sergio Lopez &lt;slp@redhat.com&gt;
diff --git a/crates/muvm/src/bin/muvm.rs b/crates/muvm/src/bin/muvm.rs
@@ -88,6 +88,8 @@ fn main() -> Result<()> {
         } => (cookie, lock_file, command, command_args, env),
     };
 
+    let mut env = prepare_env_vars(env).context("Failed to prepare environment variables")?;
+
     {
         // Set the log level to "off".
         //
@@ -371,7 +373,6 @@ fn main() -> Result<()> {
         muvm_guest_args.push(arg);
     }
 
-    let mut env = prepare_env_vars(env).context("Failed to prepare environment variables")?;
     env.insert(
         "MUVM_SERVER_PORT".to_owned(),
         options.server_port.to_string(),

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,8 @@ fn main() -> Result<()> {`
`88`	`88`	`} => (cookie, lock_file, command, command_args, env),`
`89`	`89`	`};`
`90`	`90`
	`91`	`+ let mut env = prepare_env_vars(env).context("Failed to prepare environment variables")?;`
	`92`	`+`
`91`	`93`	`{`
`92`	`94`	`// Set the log level to "off".`
`93`	`95`	`//`
`@@ -371,7 +373,6 @@ fn main() -> Result<()> {`
`371`	`373`	`muvm_guest_args.push(arg);`
`372`	`374`	`}`
`373`	`375`
`374`		`- let mut env = prepare_env_vars(env).context("Failed to prepare environment variables")?;`
`375`	`376`	`env.insert(`
`376`	`377`	`"MUVM_SERVER_PORT".to_owned(),`
`377`	`378`	`options.server_port.to_string(),`