From: DongHun Kwak Date: Tue, 10 Jan 2017 05:28:43 +0000 (+0900) Subject: Imported Upstream version 1.11.52 X-Git-Tag: upstream/1.11.52 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F81%2F109381%2F1;p=platform%2Fupstream%2Fzypper.git Imported Upstream version 1.11.52 Change-Id: Iadf10d7c78292faca20e5898734af2d7c7b4cf95 Signed-off-by: DongHun Kwak --- diff --git a/VERSION.cmake b/VERSION.cmake index fa62193..1100e88 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -34,7 +34,7 @@ # SET(VERSION_MAJOR "1") SET(VERSION_MINOR "11") -SET(VERSION_PATCH "51") +SET(VERSION_PATCH "52") -# LAST RELEASED: 1.11.51 +# LAST RELEASED: 1.11.52 #======= diff --git a/doc/zypper.8 b/doc/zypper.8 index 1909708..5218175 100644 --- 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 -.\" Date: 02/26/2016 +.\" Date: 03/03/2016 .\" Manual: ZYPPER .\" Source: SUSE Linux .\" Language: English .\" -.TH "ZYPPER" "8" "02/26/2016" "SUSE Linux" "ZYPPER" +.TH "ZYPPER" "8" "03/03/2016" "SUSE Linux" "ZYPPER" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -967,7 +967,7 @@ Work only with the repository specified by the alias, name, number, or URI\&. Th .PP \fB\-\-skip\-interactive\fR .RS 4 -Skip interactive patches\&. +This will skip interactive patches, that is, those that need reboot, contain a message, or update a package whose license needs to be confirmed\&. .RE .PP \fB\-\-with\-interactive\fR @@ -2810,11 +2810,15 @@ Specifies table style to use\&. Table style is identified by an integer number\& .PP \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\&. The behavior of this option is somewhat different than that of options like -\fB\-\-yes\fR, since zypper can answer different answers to different questions\&. The answers also depend on other options like +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\&. .RE .PP +\fB\-\-non\-interactive\-include\-reboot\-patches\fR +.RS 4 +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\&. +.RE +.PP \fB\-x\fR, \fB\-\-xmlout\fR .RS 4 Switches to XML output\&. This option is useful for scripts or graphical frontends using zypper\&. diff --git a/doc/zypper.8.txt b/doc/zypper.8.txt index e95b043..a92f5d1 100644 --- a/doc/zypper.8.txt +++ b/doc/zypper.8.txt @@ -532,8 +532,7 @@ Update Management Commands *patch* ['options']:: Install all available needed patches. + - If there are patches that affect the package management itself, those will - be installed first and you will be asked to run the *patch* command again. + If there are patches that affect the package management itself, those will be installed first and you will be asked to run the *patch* command again. + This command is similar to *zypper update -t patch*. + @@ -557,10 +556,10 @@ Update Management Commands Work only with the repository specified by the alias, name, number, or URI. This option can be used multiple times. *--skip-interactive*:: - Skip interactive patches. + This will skip interactive patches, that is, those that need reboot, contain a message, or update a package whose license needs to be confirmed. *--with-interactive*:: - Avoid skipping of interactive patches when in non-interactive mode. + Avoid skipping of interactive patches when in non-interactive mode. *-l*, *--auto-agree-with-licenses*:: See the *update* command for description of this option. @@ -1454,7 +1453,10 @@ 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. The behavior of this option is somewhat different than that of options like *--yes*, since zypper can answer different answers to different questions. The 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*. + +*--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. *-x*, *--xmlout*:: Switches to XML output. This option is useful for scripts or graphical frontends using zypper. diff --git a/package/zypper.changes b/package/zypper.changes index a3939af..ea670e5 100644 --- a/package/zypper.changes +++ b/package/zypper.changes @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Thu Mar 3 11:02:30 CET 2016 - ma@suse.de + +- man: Rephrase unclear explanation of --non-interactive (bsc#969186) +- man: add missing --non-interactive-include-reboot-patches option +- version 1.11.52 + +------------------------------------------------------------------- +Sun Feb 28 01:14:16 CET 2016 - ma@suse.de + +- Update zypper-po.tar.bz2 + +------------------------------------------------------------------- Fri Feb 26 13:38:22 CET 2016 - ma@suse.de - Fix repo import to honor enable and autorefresh flags (bsc#967673) diff --git a/po/zypper-po.tar.bz2 b/po/zypper-po.tar.bz2 index 58368f3..6fec0da 100644 Binary files a/po/zypper-po.tar.bz2 and b/po/zypper-po.tar.bz2 differ