File 0044-Repair-bug-appearing-sometimes-when-user-m... of Package PackageKit

Overview Repositories Revisions Requests Users Attributes Meta

File 0044-Repair-bug-appearing-sometimes-when-user-must-solve-.patch of Package PackageKit (Revision 9c8d2304fe463bf9c9dea74769b09620)

Currently displaying revision 9c8d2304fe463bf9c9dea74769b09620 , Show latest

From 1d82a581e575b84399720dff61d6a461a1436481 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C5=82awomir=20Lach?= <slawek@lach.art.pl>
Date: Sun, 18 Jul 2021 15:14:28 +0200
Subject: [PATCH 44/46] - Repair bug appearing sometimes, when user must solve
 dependencies This bug was caused tmpDir object was not persist between
 routine, which checks dependency and try to install package

---
 backends/zypp/pk-backend-zypp.cpp | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp
index be0a60012..33734f3e7 100644
--- a/backends/zypp/pk-backend-zypp.cpp
+++ b/backends/zypp/pk-backend-zypp.cpp
@@ -128,6 +128,8 @@ struct backend_job_private {
   bool init;
   bool error;
   
+  filesystem::TmpDir *tmpDir;
+  
   struct msg_proc_helper *msg_proc_helper;
   
   PkBackendJob *job;
@@ -3744,7 +3746,6 @@ static void
 backend_install_files_thread (PkBackendJob *job, GVariant *params, gpointer user_data)
 {
 	MIL << endl;
-	
 	PkBitfield transaction_flags;
 	gchar **full_paths;
 	g_variant_get (params, "(t^a&s)",
@@ -3758,6 +3759,7 @@ backend_install_files_thread (PkBackendJob *job, GVariant *params, gpointer user
 	
           rjob = new (struct backend_job_private)();
           rjob->manager = NULL;
+          rjob->tmpDir = NULL;
           pk_backend_job_set_priv_data(job, rjob);
         }
         
@@ -3766,6 +3768,13 @@ backend_install_files_thread (PkBackendJob *job, GVariant *params, gpointer user
           rjob->manager = new RepoManager();
         }
         
+        if (NULL == rjob->tmpDir) {
+        
+          rjob->tmpDir = new (filesystem::TmpDir)();
+        }
+        
+        filesystem::TmpDir *tmpDir = rjob->tmpDir;
+        
         RepoManager *manager = rjob->manager;
         
         ZyppJob zjob(job);
@@ -3778,8 +3787,10 @@ backend_install_files_thread (PkBackendJob *job, GVariant *params, gpointer user
 		return;
 	}
         
+        if (FALSE == job->started) {
+        
 	// create a temporary directory
-	filesystem::TmpDir tmpDir;
+	
 	if (tmpDir == NULL) {
 		zypp_backend_finished_error (
 			job, PK_ERROR_ENUM_LOCAL_INSTALL_FAILED,
@@ -3801,7 +3812,7 @@ backend_install_files_thread (PkBackendJob *job, GVariant *params, gpointer user
 		}
 
 		// copy the rpm into tmpdir
-		string tempDest = tmpDir.path ().asString () + "/" + rpmHeader->tag_name () + ".rpm";
+		string tempDest = tmpDir->path ().asString () + "/" + rpmHeader->tag_name () + ".rpm";
 		if (filesystem::copy (full_paths[i], tempDest) != 0) {
 			zypp_backend_finished_error (
 				job, PK_ERROR_ENUM_LOCAL_INSTALL_FAILED,
@@ -3809,7 +3820,7 @@ backend_install_files_thread (PkBackendJob *job, GVariant *params, gpointer user
 			return;
 		}
 	}
-	
+        }
 	int length = snprintf(NULL, 0, "PK_TMP_DIR_%s", job->sender) + 1;
         
         char *name = (char *) malloc(length);
@@ -3825,7 +3836,7 @@ backend_install_files_thread (PkBackendJob *job, GVariant *params, gpointer user
         
 	try {
 		tmpRepo.setType(repo::RepoType::RPMPLAINDIR);
-		string url = "dir://" + tmpDir.path ().asString ();
+		string url = "dir://" + tmpDir->path ().asString ();
 		tmpRepo.addBaseUrl(Url::parseUrl(url));
 		tmpRepo.setEnabled (true);
 		tmpRepo.setAutorefresh (true);
@@ -3892,7 +3903,9 @@ backend_install_files_thread (PkBackendJob *job, GVariant *params, gpointer user
 		manager->removeRepository (tmpRepo);
 		repo.eraseFromPool();
                 
+                rjob->manager = NULL;
                 delete manager;
+                delete tmpDir;
 	} catch (const repo::RepoNotFoundException &ex) {
 		pk_backend_job_error_code (job, PK_ERROR_ENUM_REPO_NOT_FOUND, "%s", ex.asUserString().c_str() );
 	}
-- 
2.32.0

Places

File 0044-Repair-bug-appearing-sometimes-when-user-must-solve-.patch of Package PackageKit (Revision 9c8d2304fe463bf9c9dea74769b09620)

Places