Mailinglist Archive: yast-commit (723 mails)

< Previous Next >
[yast-commit] r47390 - in /trunk/yast2: library/cwm/src/CWMTsigKeys.ycp package/yast2.changes
  • From: locilka@xxxxxxxxxxxxxxxx
  • Date: Fri, 09 May 2008 08:04:04 -0000
  • Message-id: <20080509080404.DD1EE2DD94@xxxxxxxxxxxxxxxx>
Author: locilka
Date: Fri May 9 10:04:04 2008
New Revision: 47390

URL: http://svn.opensuse.org/viewcvs/yast?rev=47390&view=rev
Log:
- Fixed TSIG key generation (bnc #387099).


Modified:
trunk/yast2/library/cwm/src/CWMTsigKeys.ycp
trunk/yast2/package/yast2.changes

Modified: trunk/yast2/library/cwm/src/CWMTsigKeys.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/cwm/src/CWMTsigKeys.ycp?rev=47390&r1=47389&r2=47390&view=diff
==============================================================================
--- trunk/yast2/library/cwm/src/CWMTsigKeys.ycp (original)
+++ trunk/yast2/library/cwm/src/CWMTsigKeys.ycp Fri May 9 10:04:04 2008
@@ -174,7 +174,7 @@
y2milestone ("Removing file %1, found keys: %2", main, keys);
foreach (string k, keys, {
SCR::Execute (.target.bash, sformat (
- "rm -f /etc/named.d/K%1\\.* ",
+ "rm -rf /etc/named.d/K%1\\.* ",
tolower (k)));
});
SCR::Execute (.target.remove, main);
@@ -312,13 +312,19 @@
}
else if (ret == "_cwm_generate_key")
{
+ if (! UI::WidgetExists (`id ("_cwm_new_key_file"))) {
+ y2error ("No such UI widget: %1", "_cwm_new_key_file");
+ return nil;
+ }
+
string key = (string)UI::QueryWidget (`id ("_cwm_new_key_id"), `Value);
map stat = (map)SCR::Read (.target.stat, new_filename);
+
if (size (stat) != 0)
{
if (stat["isdir"]:false)
{
- UI::SetFocus (`id ("new_key_file"));
+ UI::SetFocus (`id ("_cwm_new_key_file"));
Report::Error (
// error report
_("Specified filename is an existing directory."));
@@ -337,7 +343,7 @@
}
if (key == nil || key == "")
{
- UI::SetFocus (`id ("new_key_name"));
+ UI::SetFocus (`id ("_cwm_new_key_id"));
// error report
Popup::Error (_("The TSIG key ID was not specified."));
return nil;
@@ -368,7 +374,7 @@
on your disk. Remove it?")))
{
SCR::Execute (.target.bash, sformat (
- "rm -f `ls /etc/named.d/K%1\\.*`",
+ "rm -rf `ls /etc/named.d/K%1\\.*`",
tolower (key)));
list<string> files = (list<string>)SCR::Read (
.target.dir,

Modified: trunk/yast2/package/yast2.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=47390&r1=47389&r2=47390&view=diff
==============================================================================
--- trunk/yast2/package/yast2.changes (original)
+++ trunk/yast2/package/yast2.changes Fri May 9 10:04:04 2008
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Fri May 9 10:03:05 CEST 2008 - locilka@xxxxxxx
+
+- Fixed TSIG key generation (bnc #387099).
+
+-------------------------------------------------------------------
Wed May 7 09:52:21 CEST 2008 - lslezak@xxxxxxx

- Progress:: store the current values correctly when a nested

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages