ref: refs/heads/master
commit 2a1766669ace5a2ccc77c729d0b0fd879899d126
Author: Ján Kupec
Date: Tue Nov 10 19:13:03 2009 +0100
changes & version
---
VERSION.cmake | 2 +-
doc/zypper.8 | 7 ++++++-
package/zypper.changes | 5 +++++
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/VERSION.cmake b/VERSION.cmake
index a09c2bf..01681fd 100644
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -31,7 +31,7 @@
#
SET(VERSION_MAJOR "1")
SET(VERSION_MINOR "2")
-SET(VERSION_PATCH "10")
+SET(VERSION_PATCH "11")
# LAST RELEASED: 1.2.10
#=======
diff --git a/doc/zypper.8 b/doc/zypper.8
index f2ad92b..877f626 100644
--- a/doc/zypper.8
+++ b/doc/zypper.8
@@ -1,4 +1,4 @@
-.TH "zypper" "8" "1.2.5" "zypper" "System Tools"
+.TH "zypper" "8" "1.2.11" "zypper" "System Tools"
.SH "SYNTAX"
.LP
zypper [\fI\-\-global\-opts\fR] <\fBcommand\fR> [\fI\-\-command\-opts\fR] [\fBcommand-arguments\fR]
@@ -1442,6 +1442,11 @@ option zypper prints and logs a warning and automatically continues without
interrupting the operation. Use this option with caution, as you can easily
overlook security problems by using it.
.TP
+.I \ \ \ \ \-\-gpg\-auto\-import\-keys
+If new repository signing key is found, do not ask what to do; trust and
+import it automatically. This option causes that the new key is imported
+also in non-interactive mode, where it would otherwise got rejected.
+.TP
.I \-p, \-\-plus\-repo <URI>
Use an additional repository for this operation. The repository aliased tmp#
and named by the specified URI will be added for this operation and removed
diff --git a/package/zypper.changes b/package/zypper.changes
index b9e4e47..ad5d3d3 100644
--- a/package/zypper.changes
+++ b/package/zypper.changes
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Tue Nov 10 18:56:34 CET 2009 - jkupec@suse.cz
+
+- --gpg-auto-import-keys global option added (fate #307087)
+
+-------------------------------------------------------------------
Tue Nov 10 15:35:14 CET 2009 - jkupec@suse.cz
- --with-interactive option added to 'patch' command (bnc #497711)
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org