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
This commit is contained in:
Olaf Hering 2015-10-02 16:01:28 +00:00 committed by Git OBS Bridge
parent c77b65524d
commit 5a672661e5
2 changed files with 3 additions and 4 deletions

View File

@ -42,7 +42,7 @@ Index: libguestfs-1.26.10/customize/customize_run.ml
| "zypper" -> | "zypper" ->
- (* XXX Should we use -n option? *) - (* XXX Should we use -n option? *)
- sprintf "zypper in %s" quoted_args - 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" -> | "unknown" ->
eprintf (f_"%s: --install is not supported for this guest operating system\n") eprintf (f_"%s: --install is not supported for this guest operating system\n")
prog; prog;
@ -51,7 +51,7 @@ Index: libguestfs-1.26.10/customize/customize_run.ml
sprintf "yum -y update" sprintf "yum -y update"
| "zypper" -> | "zypper" ->
- sprintf "zypper update" - sprintf "zypper update"
+ sprintf "zypper -n --gpg-auto-import-keys update -l" + sprintf "zypper -n update -l"
| "unknown" -> | "unknown" ->
eprintf (f_"%s: --update is not supported for this guest operating system\n") eprintf (f_"%s: --update is not supported for this guest operating system\n")
prog; prog;

View File

@ -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 Tue Sep 29 14:21:52 UTC 2015 - cbosdonnat@suse.com
- Add --gpg-auto-import-keys and -l to zypper for install and - Add -l to zypper for install and update.
update.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 14 11:27:19 UTC 2015 - cbosdonnat@suse.com Mon Sep 14 11:27:19 UTC 2015 - cbosdonnat@suse.com