43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
From 87df1c19b3d3c2b953caa44e865f39d06cb92bf0 Mon Sep 17 00:00:00 2001
|
|
From: Jeremy Drake <github@jdrake.com>
|
|
Date: Fri, 2 May 2025 11:19:35 -0700
|
|
Subject: [PATCH 33/N] fixup! Core update
|
|
|
|
don't terminate all processes and exit during core updates if:
|
|
* asked to print packages only
|
|
* asked to download packages only
|
|
* asked to operate against a different root
|
|
---
|
|
src/pacman/sync.c | 18 +++++++++++++-----
|
|
1 file changed, 13 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/src/pacman/sync.c b/src/pacman/sync.c
|
|
index 03a307c..6bc8217 100644
|
|
--- a/src/pacman/sync.c
|
|
+++ b/src/pacman/sync.c
|
|
@@ -856,11 +856,19 @@ static int sync_trans(alpm_list_t *targets)
|
|
|
|
if(config->op_s_upgrade) {
|
|
#ifdef __MSYS__
|
|
- if((retval = core_update(&found_core_updates))) {
|
|
- return retval;
|
|
- }
|
|
- if(found_core_updates) {
|
|
- return retval;
|
|
+ if (config->print || config->op_s_downloadonly || strcmp(config->rootdir, "/") != 0) {
|
|
+ if(alpm_sync_sysupgrade_core(config->handle, config->op_s_upgrade >= 2) == -1) {
|
|
+ pm_printf(ALPM_LOG_ERROR, "%s\n", alpm_strerror(alpm_errno(config->handle)));
|
|
+ trans_release();
|
|
+ return 1;
|
|
+ }
|
|
+ } else {
|
|
+ if((retval = core_update(&found_core_updates))) {
|
|
+ return retval;
|
|
+ }
|
|
+ if(found_core_updates) {
|
|
+ return retval;
|
|
+ }
|
|
}
|
|
#endif
|
|
if(!config->print) {
|