From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 4 Jul 2021 11:26:20 +0000 (+0000)
Subject: update: Drop --allow-{arch,vendor}change
X-Git-Tag: 0.9.28~1110
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da4860aeb0d6bc1f4d0be0ac3cfa6096120c951e;p=pakfire.git

update: Drop --allow-{arch,vendor}change

I am not sure if these are useful for us at all

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

diff --git a/src/_pakfire/pakfire.c b/src/_pakfire/pakfire.c
index 43a358cf2..da7b6879c 100644
--- a/src/_pakfire/pakfire.c
+++ b/src/_pakfire/pakfire.c
@@ -341,22 +341,16 @@ static PyObject* Pakfire_update(PakfireObject* self, PyObject* args, PyObject* k
 	char* kwlist[] = {
 		"packages",
 		"excludes",
-		"allow_archchange",
-		"allow_vendorchange",
 		NULL
 	};
 	char** packages = NULL;
 	char** excludes = NULL;
-	int allow_vendorchange = 0;
 	int flags = 0;
 
-	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&|$O&p", kwlist,
-			convert_packages, &packages, convert_packages, &excludes, &allow_vendorchange))
+	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&|$O&", kwlist,
+			convert_packages, &packages, convert_packages, &excludes))
 		return NULL;
 
-	if (allow_vendorchange)
-		flags |= PAKFIRE_SOLVER_ALLOW_VENDORCHANGE;
-
 	// Run pakfire_update
 	int r = pakfire_update(self->pakfire, (const char**)packages,
 		(const char**)excludes, flags, NULL);
diff --git a/src/pakfire/cli.py b/src/pakfire/cli.py
index 271424f24..b86088fd6 100644
--- a/src/pakfire/cli.py
+++ b/src/pakfire/cli.py
@@ -136,10 +136,6 @@ class Cli(object):
 			help=_("Update the whole system or one specific package"))
 		update.add_argument("package", nargs="*",
 			help=_("Give a name of a package to update or leave emtpy for all"))
-		update.add_argument("--allow-archchange", action="store_true",
-			help=_("Allow changing the architecture of packages"))
-		update.add_argument("--allow-vendorchange", action="store_true",
-			help=_("Allow changing the vendor of packages"))
 		update.add_argument("--exclude", "-x", nargs="+", default=[],
 			help=_("Exclude package from update"))
 		update.set_defaults(func=self.handle_update)
@@ -261,8 +257,6 @@ class Cli(object):
 		p.update(
 			ns.package,
 			excludes=ns.exclude,
-			#allow_archchange=ns.allow_archchange,
-			#allow_vendorchange=ns.allow_vendorchange,
 		)
 
 	def handle_sync(self, ns):