b3e8a25 Support cancellation in pkg_jobs_fetch(). — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Support cancellation in pkg_jobs_fetch().

Gleb Popov committed 2 years ago

commit b3e8a25a9c9a6e8dee0a9a3bb56e070e54b7d1fe
parent 0c262d7

1 file changed +15 -3

modified libpkg/pkg_jobs.c

@@ -2223,6 +2223,12 @@ cleanup:

 	return (retcode);
 }
 static void
 pkg_jobs_cancel(struct pkg_jobs *j)
 {
 	pkgdb_release_lock(j->db, PKGDB_LOCK_ADVISORY);
 }
 int
 pkg_jobs_apply(struct pkg_jobs *j)
 {

@@ -2274,6 +2280,9 @@ pkg_jobs_apply(struct pkg_jobs *j)

 					rc = pkg_jobs_execute(j);
 				}
 			}
 			else if (rc == EPKG_CANCEL) {
 				pkg_jobs_cancel(j);
 			}
 		}
 		else {
 			rc = pkg_jobs_execute(j);

@@ -2304,6 +2313,7 @@ pkg_jobs_fetch(struct pkg_jobs *j)

 	const char *cachedir = NULL;
 	char cachedpath[MAXPATHLEN];
 	bool mirror = (j->flags & PKG_FLAG_FETCH_MIRROR) ? true : false;
 	int retcode;
 	if (j->destdir == NULL || !mirror)

@@ -2386,12 +2396,14 @@ pkg_jobs_fetch(struct pkg_jobs *j)

 				continue;
 			if (mirror) {
 				if (pkg_repo_mirror_package(p, cachedir) != EPKG_OK)
 					return (EPKG_FATAL);
 				retcode = pkg_repo_mirror_package(p, cachedir);
 				if (retcode != EPKG_OK)
 					return (retcode);
 			}
 			else {
 				retcode = pkg_repo_fetch_package(p);
 				if (pkg_repo_fetch_package(p) != EPKG_OK)
 					return (EPKG_FATAL);
 					return (retcode);
 			}
 		}
 	}