Author: lslezak
Date: Tue Jan 15 13:51:20 2008
New Revision: 43607
URL: http://svn.opensuse.org/viewcvs/yast?rev=43607&view=rev
Log:
- write key manager configuration, display/edit only trusted keys
(untrusted keys have no storage and will be lost at exit)
Modified:
trunk/packager/package/yast2-packager.changes
trunk/packager/src/clients/key_manager.ycp
trunk/packager/src/clients/repositories.ycp
trunk/packager/src/include/key_manager_dialogs.ycp
trunk/packager/src/modules/KeyManager.ycp
Modified: trunk/packager/package/yast2-packager.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=43607&r1=43606&r2=43607&view=diff
==============================================================================
--- trunk/packager/package/yast2-packager.changes (original)
+++ trunk/packager/package/yast2-packager.changes Tue Jan 15 13:51:20 2008
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Jan 15 13:49:28 CET 2008 - lslezak@suse.cz
+
+- write key manager configuration, display/edit only trusted keys
+ (untrusted keys have no storage and will be lost at exit)
+
+-------------------------------------------------------------------
Mon Jan 14 17:25:07 CET 2008 - lslezak@suse.cz
- display details about the GPG key selected for import, UI fully
Modified: trunk/packager/src/clients/key_manager.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/key_manager.ycp?rev=43607&r1=43606&r2=43607&view=diff
==============================================================================
--- trunk/packager/src/clients/key_manager.ycp (original)
+++ trunk/packager/src/clients/key_manager.ycp Tue Jan 15 13:51:20 2008
@@ -55,6 +55,11 @@
return `next;
}
+symbol Write()
+{
+ return KeyManager::Write() ? `next : `abort;
+}
+
// main function - start the workflow
symbol Main()
{
@@ -66,7 +71,7 @@
map aliases = $[
"read" : ``(Read()),
"edit" : ``(RunGPGKeyMgmt(true)),
-// TODO "write" : Write()
+ "write" : ``(Write())
];
map sequence = $[
@@ -76,12 +81,12 @@
],
"edit" : $[
`abort : `abort,
+ `next : "write",
+ ],
+ "write" : $[
`next : `next,
+ `abort : `abort,
],
-// "write" : $[
-// `next : "summary",
-// `abort : `abort,
-// ],
];
y2milestone ("Starting the key management sequence");
Modified: trunk/packager/src/clients/repositories.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositories.ycp?rev=43607&r1=43606&r2=43607&view=diff
==============================================================================
--- trunk/packager/src/clients/repositories.ycp (original)
+++ trunk/packager/src/clients/repositories.ycp Tue Jan 15 13:51:20 2008
@@ -515,11 +515,14 @@
}
);
+ y2internal("success: %1", success);
// store in the persistent libzypp storage
success = success && Pkg::SourceSaveAll(); // #176013
- success = success && KeyManager::Write();
+ y2internal("success: %1", success);
+ success = KeyManager::Write() && success;
+ y2internal("success: %1", success);
return success;
}
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=43607&r1=43606&r2=43607&view=diff
==============================================================================
--- trunk/packager/src/include/key_manager_dialogs.ycp (original)
+++ trunk/packager/src/include/key_manager_dialogs.ycp Tue Jan 15 13:51:20 2008
@@ -56,8 +56,7 @@
map r = $[
"id" : key["id"]:"",
- "table_descr" : [ key["trusted"]:false ? UI::Glyph (`CheckMark) : "",
- key["id"]:"", key["name"]:"" ],
+ "table_descr" : [ key["id"]:"", key["name"]:"" ],
"rich_descr" : WizardHW::CreateRichTextDescription(sformat(_("Key: %1"), key["id"]:""), descr)
];
@@ -86,53 +85,9 @@
// set the previously selected key
WizardHW::SetSelectedItem(selected_key);
}
-}
-/**
- * Display a dialog for editing the properties of the selected GPG key
- */
-boolean EditKeyProperties(map key)
-{
- UI::OpenDialog(
- `MarginBox(1, 0.3,
- `VBox(
- `Frame(_("GPG Key Properties"),
- `VBox(
- `Left(`Label(sformat(_("Key ID: %1"), key["id"]:""))),
- `Left(`Label(sformat(_("Name: %1"), key["name"]:""))),
- `VSpacing(0.3),
- `Left(`CheckBox(`id(`trusted), _("&The Key is Trusted"), key["trusted"]:false)),
- `VSpacing(0.2)
- )
- ),
- `VSpacing(0.2),
- `HBox(
- `PushButton(`id(`ok),`opt(`key_F10, `default), Label::OKButton()),
- `HSpacing(2),
- `PushButton(`id(`cancel), `opt(`key_F9), Label::CancelButton())
- )
- )
- )
- );
-
- symbol ui = (symbol)UI::UserInput();
- boolean ret = false;
-
- if (ui == `ok)
- {
- boolean new_value = (boolean)UI::QueryWidget(`id(`trusted), `Value);
- if (new_value != key["trusted"]:false)
- {
- key["trusted"] = new_value;
- KeyManager::ModifyKey(key);
- }
-
- ret = true;
- }
-
- UI::CloseDialog();
-
- return ret;
+ // properties of a key cannot be changed, disable Edit button
+ UI::ChangeWidget(`id(`edit), `Enabled, false);
}
// remember the details about the added key from AddGPGKey(),
@@ -168,15 +123,12 @@
`MarginBox(1, 0.3,
`VBox(
`HBox(
- `TextEntry(`id(`file), `opt(`notify,`immediate), Label::FileName()),
+ `TextEntry(`id(`file), `opt(`notify), Label::FileName()),
`VBox(
`Label(""),
`PushButton(`id(`browse), Label::BrowseButton())
)
- ),
- `VSpacing(0.2),
- `Left(`CheckBox(`id(`trusted), _("&The Key is Trusted"), false)),
- `VSpacing(0.3)
+ )
)
)
),
@@ -264,8 +216,8 @@
continue;
}
- boolean trusted = (boolean) UI::QueryWidget(`id(`trusted), `Value);
- added_key = KeyManager::ImportFromFile(keyfile, trusted);
+ // always add as trusted
+ added_key = KeyManager::ImportFromFile(keyfile, true);
if (added_key == nil || size(added_key) == 0)
{
@@ -309,7 +261,7 @@
");
// table header
- WizardHW::CreateHWDialog(title, help_text, [_("Trusted"), _("Key ID"), _("Name")], []);
+ WizardHW::CreateHWDialog(title, help_text, [_("Key ID"), _("Name")], []);
// set the navigation keys according to the current mode
if (gpg_mgr_standalone_mode)
@@ -340,18 +292,8 @@
y2milestone("Selected key: %1, action: %2", key_id, ret);
- // change key properties
- if (ret == `edit)
- {
- map key = KeyManager::SearchGPGKey(key_id);
-
- if (key != nil && EditKeyProperties(key))
- {
- SetItems(key_id);
- }
- }
// remove the key
- else if (ret == `delete)
+ if (ret == `delete)
{
map key = KeyManager::SearchGPGKey(key_id);
Modified: trunk/packager/src/modules/KeyManager.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/KeyManager.ycp?rev=43607&r1=43606&r2=43607&view=diff
==============================================================================
--- trunk/packager/src/modules/KeyManager.ycp (original)
+++ trunk/packager/src/modules/KeyManager.ycp Tue Jan 15 13:51:20 2008
@@ -24,7 +24,7 @@
list