From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 4 Jul 2021 11:23:03 +0000 (+0000)
Subject: update: Try to update all packages if none are given on CLI
X-Git-Tag: 0.9.28~1111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8e6f6705007d7fa14880282a852242db074bf28;p=pakfire.git

update: Try to update all packages if none are given on CLI

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libpakfire/include/pakfire/request.h b/src/libpakfire/include/pakfire/request.h
index cafb7bfcf..71bee5593 100644
--- a/src/libpakfire/include/pakfire/request.h
+++ b/src/libpakfire/include/pakfire/request.h
@@ -59,7 +59,7 @@ int pakfire_request_erase_package(struct pakfire_request* request, struct pakfir
 int pakfire_request_update(struct pakfire_request* request, const char* what, int flags);
 int pakfire_request_update_package(struct pakfire_request* request, struct pakfire_package* package);
 
-int pakfire_request_update_all(struct pakfire_request* request);
+int pakfire_request_update_all(struct pakfire_request* request, int flags);
 int pakfire_request_sync(struct pakfire_request* request, int flags);
 
 int pakfire_request_lock(struct pakfire_request* request, const char* what);
diff --git a/src/libpakfire/pakfire.c b/src/libpakfire/pakfire.c
index 410d19b11..19f6372e5 100644
--- a/src/libpakfire/pakfire.c
+++ b/src/libpakfire/pakfire.c
@@ -1684,12 +1684,6 @@ PAKFIRE_EXPORT int pakfire_erase(Pakfire pakfire, const char** packages,
 		locks, flags, changed);
 }
 
-PAKFIRE_EXPORT int pakfire_update(Pakfire pakfire, const char** packages,
-		const char** locks, int flags, int* changed) {
-	return pakfire_perform_transaction(pakfire, pakfire_request_update, packages,
-		locks, flags, changed);
-}
-
 static int pakfire_perform_transaction_simple(Pakfire pakfire,
 		int (*action)(struct pakfire_request* request, int flags),
 		int flags, int* changed) {
@@ -1771,6 +1765,18 @@ ERROR:
 	return r;
 }
 
+PAKFIRE_EXPORT int pakfire_update(Pakfire pakfire, const char** packages,
+		const char** locks, int flags, int* changed) {
+	// If no packages are being passed, we will try to update everything
+	// XXX add locks
+	if (!packages)
+		return pakfire_perform_transaction_simple(
+			pakfire, pakfire_request_update_all, flags, changed);
+
+	return pakfire_perform_transaction(pakfire, pakfire_request_update, packages,
+		locks, flags, changed);
+}
+
 static int pakfire_verify(Pakfire pakfire, int *changed) {
 	return pakfire_perform_transaction_simple(pakfire, pakfire_request_verify, 0, changed);
 }
diff --git a/src/libpakfire/request.c b/src/libpakfire/request.c
index 7857390e6..6d3725006 100644
--- a/src/libpakfire/request.c
+++ b/src/libpakfire/request.c
@@ -538,8 +538,8 @@ PAKFIRE_EXPORT int pakfire_request_update_package(
 	return pakfire_request_add_package(request, SOLVER_UPDATE, package, 0);
 }
 
-PAKFIRE_EXPORT int pakfire_request_update_all(struct pakfire_request* request) {
-	queue_push2(&request->jobs, SOLVER_SOLVABLE_ALL|SOLVER_UPDATE, 0);
+PAKFIRE_EXPORT int pakfire_request_update_all(struct pakfire_request* request, int flags) {
+	queue_push2(&request->jobs, SOLVER_SOLVABLE_ALL|SOLVER_UPDATE|erase_flags(flags), 0);
 
 	return 0;
 }
diff --git a/src/pakfire/cli.py b/src/pakfire/cli.py
index b52a3acd6..271424f24 100644
--- a/src/pakfire/cli.py
+++ b/src/pakfire/cli.py
@@ -261,8 +261,8 @@ class Cli(object):
 		p.update(
 			ns.package,
 			excludes=ns.exclude,
-			allow_archchange=ns.allow_archchange,
-			allow_vendorchange=ns.allow_vendorchange,
+			#allow_archchange=ns.allow_archchange,
+			#allow_vendorchange=ns.allow_vendorchange,
 		)
 
 	def handle_sync(self, ns):