Author: jsuchome
Date: Fri Aug 10 13:47:11 2007
New Revision: 40173
URL: http://svn.opensuse.org/viewcvs/yast?rev=40173&view=rev
Log:
- helptext for kiwi UI
- CLI option for gpg passphrase (patch by daniel.rahn and lslezak,
#287477)
- 2.15.4
Modified:
trunk/product-creator/VERSION
trunk/product-creator/package/yast2-product-creator.changes
trunk/product-creator/src/commandline.ycp
trunk/product-creator/src/kiwi_dialogs.ycp
trunk/product-creator/src/product-creator.ycp
Modified: trunk/product-creator/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=40173&r1=40172&r2=40173&view=diff
==============================================================================
--- trunk/product-creator/VERSION (original)
+++ trunk/product-creator/VERSION Fri Aug 10 13:47:11 2007
@@ -1 +1 @@
-2.15.3
+2.15.4
Modified: trunk/product-creator/package/yast2-product-creator.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-product-creator.changes?rev=40173&r1=40172&r2=40173&view=diff
==============================================================================
--- trunk/product-creator/package/yast2-product-creator.changes (original)
+++ trunk/product-creator/package/yast2-product-creator.changes Fri Aug 10 13:47:11 2007
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Fri Aug 10 13:30:54 CEST 2007 - jsuchome@suse.cz
+
+- helptext for kiwi UI
+- CLI option for gpg passphrase (patch by daniel.rahn and lslezak,
+ #287477)
+- 2.15.4
+
+-------------------------------------------------------------------
Thu Aug 9 14:42:49 CEST 2007 - jsuchome@suse.cz
- kiwi UI: enable creating config from scratch, with default
Modified: trunk/product-creator/src/commandline.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/commandline.ycp?rev=40173&r1=40172&r2=40173&view=diff
==============================================================================
--- trunk/product-creator/src/commandline.ycp (original)
+++ trunk/product-creator/src/commandline.ycp Fri Aug 10 13:47:11 2007
@@ -10,11 +10,32 @@
{
import "CommandLine";
import "Progress";
-
+ import "ProductCreator";
textdomain "product-creator";
+
+ void ProcessConfigFileOption(map params)
+ {
+ if (haskey(params, "configfile"))
+ {
+ string new_config = params["configfile"]:"";
+
+ if (new_config != nil && new_config != "")
+ {
+ y2milestone("Using config file: %1", new_config);
+
+ // TODO FIXME: set the config file path in "initialize" handler,
+ // don't read the default config file if the "configfile" option is used
+ ProductCreator::ConfigFile = new_config;
+ ProductCreator::Read();
+ }
+ }
+ }
+
boolean ListHandler(map params)
{
+ ProcessConfigFileOption(params);
+
foreach(string name, map conf, ProductCreator::Configs,
{
CommandLine::Print(name);
@@ -28,6 +49,8 @@
{
y2milestone("CreateIsoHandler parameters: %1", params);
+ ProcessConfigFileOption(params);
+
string name = params["name"]:"";
if (name != "")
@@ -41,13 +64,16 @@
return false;
}
- string file = params["passphrase"]:"";
+ string file = params["passphrase_file"]:"";
if (file != nil && file != "")
{
y2milestone("Reading passphrase from file %1...", file);
ProductCreator::gpg_passphrase = (string)SCR::Read(.target.string, file);
}
+ if (haskey (params, "passphrase"))
+ ProductCreator::gpg_passphrase = params["passphrase"]:"";
+
// disable the progress
boolean progress = Progress::set(false);
Modified: trunk/product-creator/src/kiwi_dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs.ycp?rev=40173&r1=40172&r2=40173&view=diff
==============================================================================
--- trunk/product-creator/src/kiwi_dialogs.ycp (original)
+++ trunk/product-creator/src/kiwi_dialogs.ycp Fri Aug 10 13:47:11 2007
@@ -1398,6 +1398,21 @@
// originally enabled list of sources
list<map> enabled_sources = [];
+ // help text for kiwi UI preparation
+ string help = _("<p>Enter the name of your image configuration or <b>Import</b> the directory with the existing one.</p>") +
+
+ // help text for kiwi UI preparation, cont.
+ _("<p>Choose the <b>Image Type</b> which should be created.</p>") +
+
+ // help text for kiwi UI preparation, cont.
+ _("<p>Select <b>Output Directory</b> for the created image.</p>") +
+
+ // help text for kiwi UI preparation, cont.
+ _("<p>Modify the list of <b>Package Repositories</b> that will be used for creating the image. If the list is empty, current system repositories will be used.</p>") +
+
+ // help text for kiwi UI preparation, cont.
+ _("<p>Use <b>Next</b> to continue with the configuration.</p>");
+
// on start, show the default YaST sources
if (Config == $[])
{
@@ -1526,7 +1541,7 @@
)
);
// dialog caption
- Wizard::SetContentsButtons (_("Image preparation"), contents, "",
+ Wizard::SetContentsButtons (_("Image preparation"), contents, help,
Label::BackButton(), Label::NextButton());
if (Config == $[] && kiwi_configuration != "")
Modified: trunk/product-creator/src/product-creator.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/product-creator.ycp?rev=40173&r1=40172&r2=40173&view=diff
==============================================================================
--- trunk/product-creator/src/product-creator.ycp (original)
+++ trunk/product-creator/src/product-creator.ycp Fri Aug 10 13:47:11 2007
@@ -53,13 +53,24 @@
],
"passphrase" : $[
// translators: command line help text for the 'passhrase' option
+ "help" : _("GPG passhrase required for signing the source."),
+ "type" : "string"
+ ],
+ "passphrase_file" : $[
+ // command line help text for the 'passhrase_file' option
"help" : _("File with GPG passhrase required for signing the source"),
"type" : "string"
+ ],
+ "configfile" : $[
+ // cmd line help text for the 'configfile' option, %1 is a file name
+ "help" : sformat(_("Path to the configuration file (default is %1"),
+ ProductCreator::ConfigFile),
+ "type" : "string"
]
],
"mappings" : $[
- "list" : [],
- "create-iso" : ["name", "passphrase"],
+ "list" : ["configfile"],
+ "create-iso" : ["name", "passphrase", "passphrase_file", "configfile"],
]
];
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org