Hello community,
here is the log from the commit of package yast2-product-creator
checked in at Fri Aug 10 17:00:58 CEST 2007.
--------
--- yast2-product-creator/yast2-product-creator.changes 2007-08-09 15:49:55.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-product-creator/yast2-product-creator.changes 2007-08-10 13:46:47.510184000 +0200
@@ -1,0 +2,8 @@
+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
+
+-------------------------------------------------------------------
Old:
----
yast2-product-creator-2.15.3.tar.bz2
New:
----
yast2-product-creator-2.15.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-product-creator.spec ++++++
--- /var/tmp/diff_new_pack.Fh4830/_old 2007-08-10 17:00:47.000000000 +0200
+++ /var/tmp/diff_new_pack.Fh4830/_new 2007-08-10 17:00:47.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-product-creator (Version 2.15.3)
+# spec file for package yast2-product-creator (Version 2.15.4)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-product-creator
-Version: 2.15.3
+Version: 2.15.4
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-product-creator-2.15.3.tar.bz2
+Source0: yast2-product-creator-2.15.4.tar.bz2
prefix: /usr
BuildRequires: autoyast2-installation perl-XML-Writer update-desktop-files yast2-devtools yast2-packager yast2-security yast2-testsuite
Requires: yast2-packager autoyast2-installation yast2-security
@@ -33,7 +33,7 @@
%prep
-%setup -n yast2-product-creator-2.15.3
+%setup -n yast2-product-creator-2.15.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -76,6 +76,11 @@
/usr/lib/YaST2/servers_non_y2/ag_*
%changelog
+* Fri Aug 10 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 09 2007 - jsuchome@suse.cz
- kiwi UI: enable creating config from scratch, with default
YaST sources
++++++ yast2-product-creator-2.15.3.tar.bz2 -> yast2-product-creator-2.15.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.15.3/src/commandline.ycp new/yast2-product-creator-2.15.4/src/commandline.ycp
--- old/yast2-product-creator-2.15.3/src/commandline.ycp 2007-06-21 14:02:29.000000000 +0200
+++ new/yast2-product-creator-2.15.4/src/commandline.ycp 2007-08-10 13:29:23.000000000 +0200
@@ -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);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.15.3/src/kiwi_dialogs.ycp new/yast2-product-creator-2.15.4/src/kiwi_dialogs.ycp
--- old/yast2-product-creator-2.15.3/src/kiwi_dialogs.ycp 2007-08-09 14:42:35.000000000 +0200
+++ new/yast2-product-creator-2.15.4/src/kiwi_dialogs.ycp 2007-08-10 13:19:28.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs for kiwi configuration
* Authors: Jiri Suchomel
*
- * $Id: kiwi_dialogs.ycp 39888 2007-08-02 09:50:37Z jsuchome $
+ * $Id: kiwi_dialogs.ycp 40128 2007-08-09 13:50:14Z jsuchome $
*/
{
textdomain "product-creator";
@@ -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 != "")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.15.3/src/product-creator.ycp new/yast2-product-creator-2.15.4/src/product-creator.ycp
--- old/yast2-product-creator-2.15.3/src/product-creator.ycp 2007-06-21 14:19:17.000000000 +0200
+++ new/yast2-product-creator-2.15.4/src/product-creator.ycp 2007-08-10 13:29:59.000000000 +0200
@@ -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"],
]
];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.15.3/VERSION new/yast2-product-creator-2.15.4/VERSION
--- old/yast2-product-creator-2.15.3/VERSION 2007-08-09 14:43:22.000000000 +0200
+++ new/yast2-product-creator-2.15.4/VERSION 2007-08-10 13:38:42.000000000 +0200
@@ -1 +1 @@
-2.15.3
+2.15.4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org