Author: lslezak
Date: Mon Jan 14 17:30:09 2008
New Revision: 43588
URL: http://svn.opensuse.org/viewcvs/yast?rev=43588&view=rev
Log:
- display details about the GPG key selected for import
- 2.16.14
Modified:
trunk/packager/VERSION
trunk/packager/package/yast2-packager.changes
trunk/packager/src/include/key_manager_dialogs.ycp
trunk/packager/src/modules/KeyManager.ycp
trunk/packager/yast2-packager.spec.in
Modified: trunk/packager/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=43588&r1=43587&r2=43588&view=diff
==============================================================================
--- trunk/packager/VERSION (original)
+++ trunk/packager/VERSION Mon Jan 14 17:30:09 2008
@@ -1 +1 @@
-2.16.13
+2.16.14
Modified: trunk/packager/package/yast2-packager.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=43588&r1=43587&r2=43588&view=diff
==============================================================================
--- trunk/packager/package/yast2-packager.changes (original)
+++ trunk/packager/package/yast2-packager.changes Mon Jan 14 17:30:09 2008
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Mon Jan 14 17:25:07 CET 2008 - lslezak@suse.cz
+
+- display details about the GPG key selected for import, UI fully
+ works, importing/removing a key works in Write()
+- 2.16.14
+
+-------------------------------------------------------------------
Thu Jan 10 13:20:04 CET 2008 - lslezak@suse.cz
- added preliminary support for GPG key management (FATE #300754)
Modified: trunk/packager/src/include/key_manager_dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/include/key_manager_dialogs.ycp?rev=43588&r1=43587&r2=43588&view=diff
==============================================================================
--- trunk/packager/src/include/key_manager_dialogs.ycp (original)
+++ trunk/packager/src/include/key_manager_dialogs.ycp Mon Jan 14 17:30:09 2008
@@ -88,24 +88,6 @@
}
}
-map SearchGPGKey(string key_id)
-{
- map ret = nil;
-
- // search the properties of the key
- foreach(map key, KeyManager::GetKeys(),
- {
- if (key["id"]:"" == key_id)
- {
- ret = key;
- break;
- }
- }
- );
-
- return ret;
-}
-
/**
* Display a dialog for editing the properties of the selected GPG key
*/
@@ -299,13 +281,6 @@
return ret;
}
-// display details about the imported GPG key
-symbol NewKeySummary()
-{
- // TODO FIXME
- return `next;
-}
-
/**
* Display the main dialog for GPG key management
*/
@@ -368,7 +343,7 @@
// change key properties
if (ret == `edit)
{
- map key = SearchGPGKey(key_id);
+ map key = KeyManager::SearchGPGKey(key_id);
if (key != nil && EditKeyProperties(key))
{
@@ -378,7 +353,7 @@
// remove the key
else if (ret == `delete)
{
- map key = SearchGPGKey(key_id);
+ map key = KeyManager::SearchGPGKey(key_id);
if (Popup::YesNo(sformat(_("Really delete key '%1'
'%2'?"), key_id, key["name"]:"")))
Modified: trunk/packager/src/modules/KeyManager.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/KeyManager.ycp?rev=43588&r1=43587&r2=43588&view=diff
==============================================================================
--- trunk/packager/src/modules/KeyManager.ycp (original)
+++ trunk/packager/src/modules/KeyManager.ycp Mon Jan 14 17:30:09 2008
@@ -88,6 +88,29 @@
}
/**
+ * Search a GPG key in the known keys
+ * @param key_id ID of the key
+ * @return map Data about the key or nil if the key was not found
+ */
+global map SearchGPGKey(string key_id)
+{
+ map ret = nil;
+
+ // search the properties of the key
+ foreach(map key, known_keys,
+ {
+ if (key["id"]:"" == key_id)
+ {
+ ret = key;
+ break;
+ }
+ }
+ );
+
+ return ret;
+}
+
+/**
* Apply the changes, update the current status
* @return boolean true on success
*/
@@ -111,8 +134,6 @@
}
);
- // TODO modify keys (change the trusted flag)
-
// import the new keys
foreach(string tmpfile, boolean trusted, import_from_file,
{
@@ -122,6 +143,32 @@
}
);
+ // modify keys (change the trusted flag)
+ // get the current settings
+ list > current_keys = ReadCurrentKeys();
+ foreach(map key, current_keys,
+ {
+ map found_key = SearchGPGKey(key["id"]:"");
+ // is the trusted flag different?
+ if (found_key != nil && found_key["trusted"]:false != key["trusted"]:false)
+ {
+ y2milestone("Key %1 ('%2'): new trusted state: %3", found_key["id"]:"",
+ found_key["name"]:"", found_key["trusted"]:false);
+
+ // the current state is trusted
+ if (found_key["trusted"]:false)
+ {
+ // TODO move to the trusted keyring
+ }
+ else
+ {
+ // TODO move from the trusted keyring
+ }
+ }
+ }
+ );
+
+
// all changes are saved, reset them
Reset();
Modified: trunk/packager/yast2-packager.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/yast2-packager.spec.in?rev=43588&r1=43587&r2=43588&view=diff
==============================================================================
--- trunk/packager/yast2-packager.spec.in (original)
+++ trunk/packager/yast2-packager.spec.in Mon Jan 14 17:30:09 2008
@@ -6,6 +6,8 @@
# Progress::Subprogress*()
BuildRequires: yast2 >= 2.16.17
+# New functions: GPG key management
+BuildRequires: yast2-pkg-bindings >= 2.16.10
# Module: OneClickInstallStandard
Requires: perl-XML-Bare yast2-perl-bindings
@@ -14,8 +16,8 @@
Requires: yast2-country-data >= 2.16.3
Requires: yast2-installation >= 2.15.12
-# New function: Pkg::SourceProvideDirectory
-Requires: yast2-pkg-bindings >= 2.15.38
+# New functions: GPG key management
+Requires: yast2-pkg-bindings >= 2.16.10
# Progress::Subprogress*()
Requires: yast2 >= 2.16.17
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
