handle GPG keys in AutoUpgrade the same as in AutoYaST (bnc#820166)

yast · May 16, 2013 · 28e4753 · 28e4753
1 parent 86d7f28
commit 28e4753
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.17.127
+2.17.128
diff --git a/library/packages/src/PackageCallbacks.ycp b/library/packages/src/PackageCallbacks.ycp
@@ -2887,7 +2887,8 @@ global void InitPackageCallbacks() {
 
     // @see bugzilla #183821
     // Do not register these callbacks in case of AutoInstallation
-    if (Mode::autoinst() != true) {
+    // And for AutoUpgrade neither (bnc#820166)
+    if (!(Mode::autoinst() || Mode::autoupgrade())) {
 	// Signature-related callbacks
 	Pkg::CallbackAcceptUnsignedFile		(SignatureCheckCallbacks::AcceptUnsignedFile);
 	Pkg::CallbackAcceptUnknownGpgKey	(SignatureCheckCallbacks::AcceptUnknownGpgKey);

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu May 16 12:41:09 UTC 2013 - jsrain@suse.cz
+
+- handle GPG keys in AutoUpgrade the same as in AutoYaST
+  (bnc#820166)
+- 2.17.128
+
 -------------------------------------------------------------------
 Tue May 14 07:59:30 UTC 2013 - mfilka@suse.com