release zypp lock after software finish action (bsc#1258188)

rust/agama-software/src/zypp_server.rs

@@ -200,11 +200,19 @@ impl ZyppServer {
                 break;
             };
 
-            if let Err(error) = self.dispatch(action, &zypp) {
-                tracing::error!("Software dispatch error: {:?}", error);
-            }
+            match self.dispatch(action, &zypp) {
+                Ok(false) => {
+                    break;
+                }
+                Err(error) => {
+                    tracing::error!("Software dispatch error: {:?}", error);
+                }
+                _ => {}
+            };
         }
 
+        // drop explicitly zypp to release lock ASAP
+        drop(zypp);
         Ok(())
     }
 
@@ -213,7 +221,7 @@ impl ZyppServer {
         &mut self,
         action: SoftwareAction,
         zypp: &zypp_agama::Zypp,
-    ) -> Result<(), ZyppDispatchError> {
+    ) -> Result<bool, ZyppDispatchError> {
         match action {
             SoftwareAction::Write {
                 state,
@@ -242,12 +250,13 @@ impl ZyppServer {
             }
             SoftwareAction::Finish(tx) => {
                 self.finish(zypp, tx)?;
+                return Ok(false);
             }
             SoftwareAction::GetProposal(product_spec, sender) => {
                 self.proposal(product_spec, sender, zypp)?
             }
         }
-        Ok(())
+        Ok(true)
     }
 
     // Install rpms

rust/zypp-agama/zypp-agama-sys/src/bindings.rs

@@ -674,7 +674,7 @@ unsafe extern "C" {
     ) -> bool;
     #[doc = " Runs solver\n @param zypp see \\ref init_target\n @param only_required if true, only required packages are installed (ignoring\n recommended packages)\n @param[out] status (will overwrite existing contents)\n @return true if solver pass and false if it found some dependency issues"]
     pub fn run_solver(zypp: *mut Zypp, only_required: bool, status: *mut Status) -> bool;
-    #[doc = " Create a solver testcase, dumps all solver data (repositories, loaded\n packages...) to disk\n @param zypp see \\ref init_target\n @param dir directory path where the solver testcase is saved\n @return true if the solver testcase was successfully created"]
+    #[doc = " Create a solver testcase, dumps all all solver data (repositories, loaded\n packages...) to disk\n @param zypp see \\ref init_target\n @param dir directory path where the solver testcase is saved\n @return true if the solver testcase was successfully created"]
     pub fn create_solver_testcase(zypp: *mut Zypp, dir: *const ::std::os::raw::c_char) -> bool;
     #[doc = " the last call that will free all pointers to zypp holded by agama"]
     pub fn free_zypp(zypp: *mut Zypp);