From 5a672661e5e1832d5fb0448a212ee555729813d94e3ab76a4dfc34e1980b6bb1 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Fri, 2 Oct 2015 16:01:28 +0000 Subject: [PATCH] Accepting request 335947 from home:cbosdonnat:branches:Virtualization Cleaned up the gpg-keys auto import OBS-URL: https://build.opensuse.org/request/show/335947 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=352 --- 0000-hotfix.patch | 4 ++-- libguestfs.changes | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/0000-hotfix.patch b/0000-hotfix.patch index 20c118b..839636c 100644 --- a/0000-hotfix.patch +++ b/0000-hotfix.patch @@ -42,7 +42,7 @@ 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 --gpg-auto-import-keys in -l %s" quoted_args ++ sprintf "zypper -n in -l %s" quoted_args | "unknown" -> eprintf (f_"%s: --install is not supported for this guest operating system\n") prog; @@ -51,7 +51,7 @@ Index: libguestfs-1.26.10/customize/customize_run.ml sprintf "yum -y update" | "zypper" -> - sprintf "zypper update" -+ sprintf "zypper -n --gpg-auto-import-keys update -l" ++ sprintf "zypper -n update -l" | "unknown" -> eprintf (f_"%s: --update is not supported for this guest operating system\n") prog; diff --git a/libguestfs.changes b/libguestfs.changes index a397d3e..8ea0b8e 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -6,8 +6,7 @@ Thu Oct 1 12:09:22 UTC 2015 - cbosdonnat@suse.com ------------------------------------------------------------------- Tue Sep 29 14:21:52 UTC 2015 - cbosdonnat@suse.com -- Add --gpg-auto-import-keys and -l to zypper for install and - update. +- Add -l to zypper for install and update. ------------------------------------------------------------------- Mon Sep 14 11:27:19 UTC 2015 - cbosdonnat@suse.com