forked from pool/libguestfs
20f23f75d3
- Fixing issue with virt-customize uninstall and '-l'
(bnc#1131342)
Patches added:
fd43730e-error-with-uninstall-option-on-SUSE.patch
OBS-URL: https://build.opensuse.org/request/show/692396
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=433
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
From a4f65bf89d955f585f141fd3402e51eec53ba562 Mon Sep 17 00:00:00 2001
|
|
From: Sebastian Meyer <meyer@b1-systems.de>
|
|
Date: Thu, 23 Aug 2018 16:45:27 +0200
|
|
Subject: [PATCH 1/1] Fix error with --uninstall option on SUSE
|
|
|
|
The `-l` option for some `zypper` subcommands is short for
|
|
`--auto-agree-with-licenses` and not available on the `zypper rm` command.
|
|
|
|
(cherry picked from commit fd43730e2bfff17a365ffcf768b6c8db3089b524)
|
|
[BSC#1131342]
|
|
Signed-off-by: Larry Dewey <ldewey@suse.com>
|
|
---
|
|
customize/customize_run.ml | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/customize/customize_run.ml b/customize/customize_run.ml
|
|
index f92e9a199..3eacdaca0 100644
|
|
--- a/customize/customize_run.ml
|
|
+++ b/customize/customize_run.ml
|
|
@@ -181,7 +181,7 @@ exec >>%s 2>&1
|
|
| "urpmi" -> sprintf "urpme %s" quoted_args
|
|
| "xbps" -> sprintf "xbps-remove -Sy %s" quoted_args
|
|
| "yum" -> sprintf "yum -y remove %s" quoted_args
|
|
- | "zypper" -> sprintf "zypper -n rm -l %s" quoted_args
|
|
+ | "zypper" -> sprintf "zypper -n rm %s" quoted_args
|
|
|
|
| "unknown" ->
|
|
error_unknown_package_manager (s_"--uninstall")
|
|
--
|
|
2.21.0
|
|
|