From 0d2e107c89320fddd63711a6cc1449b7a76c4a7186020ee5f621ba231b982542 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 29 Sep 2015 14:29:54 +0000 Subject: [PATCH] Accepting request 334812 from home:cbosdonnat:branches:Virtualization - Add --gpg-auto-import-keys and -l to zypper for install and update. OBS-URL: https://build.opensuse.org/request/show/334812 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=349 --- 0000-hotfix.patch | 11 ++++++++++- libguestfs.changes | 6 ++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/0000-hotfix.patch b/0000-hotfix.patch index c41441c..fc80655 100644 --- a/0000-hotfix.patch +++ b/0000-hotfix.patch @@ -42,10 +42,19 @@ Index: libguestfs-1.26.10/customize/customize_run.ml | "zypper" -> - (* XXX Should we use -n option? *) - sprintf "zypper in %s" quoted_args -+ sprintf "zypper -n in %s" quoted_args ++ sprintf "zypper -n --gpg-auto-import-keys in -l %s" quoted_args | "unknown" -> eprintf (f_"%s: --install is not supported for this guest operating system\n") prog; +@@ -135,7 +136,7 @@ exec >>%s 2>&1 + | "yum" -> + sprintf "yum -y update" + | "zypper" -> +- sprintf "zypper update" ++ sprintf "zypper -n --gpg-auto-import-keys update -l" + | "unknown" -> + eprintf (f_"%s: --update is not supported for this guest operating system\n") + prog; Index: libguestfs-1.26.10/builder/downloader.ml =================================================================== --- libguestfs-1.26.10.orig/builder/downloader.ml diff --git a/libguestfs.changes b/libguestfs.changes index a66702c..8cb3c78 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 29 14:21:52 UTC 2015 - cbosdonnat@suse.com + +- Add --gpg-auto-import-keys and -l to zypper for install and + update. + ------------------------------------------------------------------- Mon Sep 14 11:27:19 UTC 2015 - cbosdonnat@suse.com