Hello community,
here is the log from the commit of package yast2-product-creator for openSUSE:Factory
checked in at Mon Mar 8 18:27:44 CET 2010.
--------
--- yast2-product-creator/yast2-product-creator.changes 2010-02-26 16:34:18.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-product-creator/yast2-product-creator.changes 2010-03-08 15:39:00.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Mar 8 15:27:43 CET 2010 - jsuchome@suse.cz
+
+- enhanced "save logs" dialog (bnc#583783)
+- 2.19.6
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-product-creator-2.19.5.tar.bz2
New:
----
yast2-product-creator-2.19.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-product-creator.spec ++++++
--- /var/tmp/diff_new_pack.H9DESe/_old 2010-03-08 18:27:37.000000000 +0100
+++ /var/tmp/diff_new_pack.H9DESe/_new 2010-03-08 18:27:37.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-product-creator (Version 2.19.5)
+# spec file for package yast2-product-creator (Version 2.19.6)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,11 +19,11 @@
Name: yast2-product-creator
-Version: 2.19.5
+Version: 2.19.6
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-product-creator-2.19.5.tar.bz2
+Source0: yast2-product-creator-2.19.6.tar.bz2
Prefix: /usr
@@ -62,7 +62,7 @@
XEN images etc.), based on existing installation sources.
%prep
-%setup -n yast2-product-creator-2.19.5
+%setup -n yast2-product-creator-2.19.6
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-product-creator-2.19.5.tar.bz2 -> yast2-product-creator-2.19.6.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.5/VERSION new/yast2-product-creator-2.19.6/VERSION
--- old/yast2-product-creator-2.19.5/VERSION 2010-02-26 16:33:29.000000000 +0100
+++ new/yast2-product-creator-2.19.6/VERSION 2010-03-08 15:28:08.000000000 +0100
@@ -1 +1 @@
-2.19.5
+2.19.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.5/src/Kiwi.ycp new/yast2-product-creator-2.19.6/src/Kiwi.ycp
--- old/yast2-product-creator-2.19.5/src/Kiwi.ycp 2010-02-22 16:02:24.000000000 +0100
+++ new/yast2-product-creator-2.19.6/src/Kiwi.ycp 2010-03-08 15:27:34.000000000 +0100
@@ -72,8 +72,9 @@
// map with image templates (to base new projects on)
global map Templates = $[];
- string stdout_file = "/tmp/image_creator.stdout";
- string stderr_file = "/tmp/image_creator.stderr";
+ string stdout_file = "image_creator.stdout";
+ string stderr_file = "image_creator.stderr";
+ string logs_directory = "/tmp";
/**
* crypt given user password with current encryption algorithm
@@ -413,25 +414,81 @@
*/
boolean save_logs_popup () {
+ string dir = logs_directory;
+
UI::OpenDialog (`opt(`decorated), `HBox(`HSpacing(1.5), `VBox (
`VSpacing (0.2),
- `TextEntry (`id (`stdout_file), _("Path to file with standard output"), stdout_file),
- `TextEntry (`id (`stderr_file), _("Path to file with error output"), stderr_file),
- `PushButton (`id (`ok), Label::SaveButton ()),
+ `HBox (
+ // text box label
+ `InputField (`id (`out_dir), `opt (`hstretch), _("Path to directory to store the log files"), dir),
+ `VBox (
+ `Label (""),
+ `PushButton (`id (`browse), Label::BrowseButton ())
+ )
+ ),
+ // text box label
+ `InputField (`id (`stdout_file), `opt (`hstretch), _("Standard output file name"), stdout_file),
+ // text box label
+ `InputField (`id (`stderr_file), `opt (`hstretch), _("Error output file name"), stderr_file),
+ `VSpacing (0.2),
+ `ButtonBox (
+ `PushButton (`id (`ok), Label::SaveButton ()),
+ `PushButton (`id (`cancel), Label::CancelButton ())
+ ),
`VSpacing (0.2)
), `HSpacing(1.5)));
- UI::UserInput ();
+ any ret = `cancel;
+ string full_stdout = dir + "/" + stdout_file;
+ string full_stderr = dir + "/" + stderr_file;
+
+ while (true)
+ {
+ ret = UI::UserInput ();
+ if (ret == `cancel)
+ {
+ UI::CloseDialog ();
+ break;
+ }
+ if (ret == `browse)
+ {
+ string selected = UI::AskForExistingDirectory (dir, "");
+ if (selected != nil)
+ UI::ChangeWidget (`id(`out_dir), `Value, selected);
+ }
+ if (ret == `ok)
+ {
+ dir = (string) UI::QueryWidget (`id (`out_dir), `Value);
+ full_stdout = dir + "/" + (string) UI::QueryWidget (`id (`stdout_file), `Value);
+ full_stderr = dir + "/" + (string) UI::QueryWidget (`id (`stderr_file), `Value);
+ if (FileUtils::Exists (full_stdout) &&
+ !Popup::YesNo (sformat (_("File %1 already exists.
+Rewrite?"), full_stdout)))
+ continue;
+ if (FileUtils::Exists (full_stderr) &&
+ !Popup::YesNo (sformat (_("File %1 already exists.
+Rewrite?"), full_stderr)))
+ continue;
+ break;
+ }
+ }
+
+ if (ret == `cancel) return false;
stdout_file = (string) UI::QueryWidget (`id (`stdout_file), `Value);
stderr_file = (string) UI::QueryWidget (`id (`stderr_file), `Value);
+
UI::CloseDialog ();
- if (FileUtils::CheckAndCreatePath (path_to_dir (stdout_file)))
- SCR::Write (.target.string, stdout_file, (string) UI::QueryWidget (`id (`log), `Value));
- if (FileUtils::CheckAndCreatePath (path_to_dir (stderr_file)))
- SCR::Write (.target.string, stderr_file, (string) UI::QueryWidget (`id (`errlog), `Value));
+ if (FileUtils::CheckAndCreatePath (dir))
+ SCR::Write (.target.string, full_stdout, (string) UI::QueryWidget (`id (`log), `Value));
+ else return false;
+
+ SCR::Write (.target.string, full_stderr, (string) UI::QueryWidget (`id (`errlog), `Value));
+
+ logs_directory = dir;
+
return true;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.19.5/src/kiwi_dialogs.ycp new/yast2-product-creator-2.19.6/src/kiwi_dialogs.ycp
--- old/yast2-product-creator-2.19.5/src/kiwi_dialogs.ycp 2010-02-26 16:32:58.000000000 +0100
+++ new/yast2-product-creator-2.19.6/src/kiwi_dialogs.ycp 2010-02-26 16:34:11.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Dialogs for kiwi configuration
* Authors: Jiri Suchomel
*
- * $Id: kiwi_dialogs.ycp 60526 2010-01-25 19:03:05Z jsuchome $
+ * $Id: kiwi_dialogs.ycp 61052 2010-02-26 15:33:41Z jsuchome $
*/
{
textdomain "product-creator";
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org