Imported Upstream version 1.11.55

Change-Id: Ia00842688c0847782960da4d7a4ab53d897e25be
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/VERSION.cmake b/VERSION.cmake
index bda20e7..fc11fbf 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -34,7 +34,7 @@
 #
 SET(VERSION_MAJOR "1")
 SET(VERSION_MINOR "11")
-SET(VERSION_PATCH "54")
+SET(VERSION_PATCH "55")
 
-# LAST RELEASED: 1.11.54
+# LAST RELEASED: 1.11.55
 #=======

diff --git a/doc/zypper.8 b/doc/zypper.8
index 5218175..fe3849a 100644 (file)
--- a/doc/zypper.8
+++ b/doc/zypper.8
@@ -2,12 +2,12 @@
 .\"     Title: zypper
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 03/03/2016
+.\"      Date: 05/18/2016
 .\"    Manual: ZYPPER
 .\"    Source: SUSE Linux
 .\"  Language: English
 .\"
-.TH "ZYPPER" "8" "03/03/2016" "SUSE Linux" "ZYPPER"
+.TH "ZYPPER" "8" "05/18/2016" "SUSE Linux" "ZYPPER"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -2811,7 +2811,9 @@ Specifies table style to use\&. Table style is identified by an integer number\&
 \fB\-n\fR, \fB\-\-non\-interactive\fR
 .RS 4
 Switches to non\-interactive mode\&. In this mode zypper doesn\(cqt ask user to type answers to various prompts, but uses default answers automatically\&. Those default answers also depend on other options like
-\fB\-\-no\-gpg\-checks\fR\&.
+\fB\-\-no\-gpg\-checks\fR
+or
+\fB\-\-ignore\-unknown\fR\&.
 .RE
 .PP
 \fB\-\-non\-interactive\-include\-reboot\-patches\fR
@@ -2826,7 +2828,9 @@ Switches to XML output\&. This option is useful for scripts or graphical fronten
 .PP
 \fB\-i\fR, \fB\-\-ignore\-unknown\fR
 .RS 4
-Ignore unknown packages\&. This option is useful for scripts\&.
+Ignore unknown packages\&. This option is useful for scripts, because when installing in
+\fB\-\-non\-interactive\fR
+mode zypper expects each command line argument to match at least one known package\&. Unknown names or globbing expressions with no match are treated as an error unless this option is used\&.
 .RE
 .PP
 \fB\-D\fR, \fB\-\-reposd\-dir\fR \fIdir\fR

diff --git a/doc/zypper.8.txt b/doc/zypper.8.txt
index a92f5d1..2745042 100644 (file)
--- a/doc/zypper.8.txt
+++ b/doc/zypper.8.txt
@@ -1453,7 +1453,7 @@ GLOBAL OPTIONS
        Specifies table style to use. Table style is identified by an integer number. TODO
 
 *-n*, *--non-interactive*::
-       Switches to non-interactive mode. In this mode zypper doesn't ask user to type answers to various prompts, but uses default answers automatically. Those default answers also depend on other options like *--no-gpg-checks*.
+       Switches to non-interactive mode. In this mode zypper doesn't ask user to type answers to various prompts, but uses default answers automatically. Those default answers also depend on other options like *--no-gpg-checks* or *--ignore-unknown*.
 
 *--non-interactive-include-reboot-patches*::
        In non-interactive mode do not skip patches which have the rebootSuggested-flag set. Otherwise these patches are considered to be interactive, like patches including a licenses or some message to confirm. NOTE: This option does not turn on non-interactive mode.
@@ -1462,7 +1462,7 @@ GLOBAL OPTIONS
        Switches to XML output. This option is useful for scripts or graphical frontends using zypper.
 
 *-i*, *--ignore-unknown*::
-       Ignore unknown packages. This option is useful for scripts.
+       Ignore unknown packages. This option is useful for scripts, because when installing in *--non-interactive* mode zypper expects each command line argument to match at least one known package. Unknown names or globbing expressions with no match are treated as an error unless this option is used.
 
 *-D*, *--reposd-dir* 'dir'::
        Use the specified directory to look for the repository definition (*.repo*) files. The default value is */etc/zypp/repos.d*.

diff --git a/package/zypper.changes b/package/zypper.changes
index 5aa9041..90ac0e1 100644 (file)
--- a/package/zypper.changes
+++ b/package/zypper.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Wed May 18 12:37:18 CEST 2016 - ma@suse.de
+
+- Do not require --ignore-unknown in non interactive remove-command
+ (bsc#980263)
+- version 1.11.55
+
+-------------------------------------------------------------------
 Wed Apr 13 16:35:48 CEST 2016 - ma@suse.de
 
 - Fix testing for '-- download*' options (bsc#956480)

diff --git a/src/Zypper.cc b/src/Zypper.cc
index 4549ca2..7913763 100644 (file)
--- a/src/Zypper.cc
+++ b/src/Zypper.cc
@@ -4114,9 +4114,9 @@ void Zypper::doCommand()
         (sr.hasFeedback(SolverRequester::Feedback::NOT_FOUND_NAME) ||
          sr.hasFeedback(SolverRequester::Feedback::NOT_FOUND_CAP)))
     {
-      setExitCode(ZYPPER_EXIT_INF_CAP_NOT_FOUND);
-      if (globalOpts().non_interactive)
-        ZYPP_THROW(ExitRequestException("name or capability not found"));
+      setExitCode( ZYPPER_EXIT_INF_CAP_NOT_FOUND );
+      if ( command () != ZypperCommand::REMOVE && globalOpts().non_interactive )       // bsc#980263: relax if removing packages
+        ZYPP_THROW( ExitRequestException("name or capability not found") );
     }
 
     // give user feedback from package selection