Accepting request 284494 from home:cbosdonnat:branches:Virtualization

- Make zypper called with -n parameter when installing packages.
  5f663c20-zypper-non-interactive.patch (bsc#916567)

OBS-URL: https://build.opensuse.org/request/show/284494
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=331

5f663c20-zypper-non-interactive.patch

@@ -0,0 +1,23 @@
+From 5f663c2082446f2b9722c3cb0fcac6c5778978e8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>
+Date: Tue, 3 Feb 2015 14:38:02 +0000
+Subject: [PATCH] customize: Invoke zypper correctly.
+
+---
+ customize/customize_run.ml | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+Index: libguestfs-1.26.9/customize/customize_run.ml
+===================================================================
+--- libguestfs-1.26.9.orig/customize/customize_run.ml
++++ libguestfs-1.26.9/customize/customize_run.ml
+@@ -105,8 +105,7 @@ exec >>%s 2>&1
+     | "yum" ->
+       sprintf "yum -y install %s" quoted_args
+     | "zypper" ->
+-      (* XXX Should we use -n option? *)
+-      sprintf "zypper in %s" quoted_args
++      sprintf "zypper -n in %s" quoted_args
+     | "unknown" ->
+       eprintf (f_"%s: --install is not supported for this guest operating system\n")
+         prog;

libguestfs.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Feb  6 13:45:22 UTC 2015 - cbosdonnat@suse.com
+
+- Make zypper called with -n parameter when installing packages.
+  5f663c20-zypper-non-interactive.patch (bsc#916567)
+
 -------------------------------------------------------------------
 Tue Dec  9 15:44:39 UTC 2014 - ohering@suse.de
 

libguestfs.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libguestfs
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2011 Michal Hrusecky <mhrusecky@novell.com>
 #
 # All modifications and additions to the file contributed by third parties
@@ -176,6 +176,8 @@ Summary:        Compatibility package for guestfs-tools
 License:        GPL-2.0
 Group:          System/Filesystems
 Patch0:         0000-hotfix.patch
+# Upstream patch
+Patch1:         5f663c20-zypper-non-interactive.patch
 Patch1000:      1000-force-virtio_blk-in-old-guest-kernel.patch
 Source0:        %{name}-%{version}.tar.xz
 Source42:       libguestfs.mkinitrd.tar.bz2
@@ -512,6 +514,7 @@ virtual machines.
 : _ignore_exclusive_arch '%{?_ignore_exclusive_arch}'
 %setup -q -a 789653 -a 42
 %patch0 -p1
+%patch1 -p1
 %patch1000 -p1
 
 %build