Disable repositories with rejected GPG keys (fate#314990)

- 2.17.136
yast · Nov 20, 2014 · 7809d85 · 7809d85
1 parent e4aa0a9
commit 7809d85
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.17.135
+2.17.136
diff --git a/library/packages/src/SignatureCheckCallbacks.ycp b/library/packages/src/SignatureCheckCallbacks.ycp
@@ -181,7 +181,16 @@
 	if (SignatureCheckDialogs::CheckSignaturesInYaST() == false)
 	    return default_return_unchecked;
 
-	return SignatureCheckDialogs::ImportGPGKeyIntoTrustedDialog(key, repo_id);
+        boolean trusted = SignatureCheckDialogs::ImportGPGKeyIntoTrustedDialog(key, repo_id);
+
+        if (!trusted)
+        {
+            y2milestone("Disabling repository %1 (id: %2)", Pkg::SourceGeneralData(repo_id)["alias"]:"", repo_id);
+            Pkg::SourceSetEnabled(repo_id, trusted);
+            Pkg::SourceSaveAll();
+        }
+
+        return trusted;
     }
 
     // Name of the callback handler function. Required callback prototype is

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Nov 20 08:09:23 UTC 2014 - lslezak@suse.com
+
+- Disable the repository when it's GPG key is not trusted to avoid
+  asking the user to trust the key at each repository refresh,
+  needed esp. for the nVidia and ATI driver repositories
+  (fate#314990)
+- 2.17.136
+
 -------------------------------------------------------------------
 Tue Mar 25 08:11:08 CET 2014 - jsuchome@suse.cz