Hello community,
here is the log from the commit of package yast2-product-creator
checked in at Wed Dec 5 23:03:06 CET 2007.
--------
--- yast2-product-creator/yast2-product-creator.changes 2007-11-12 16:46:42.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-product-creator/yast2-product-creator.changes 2007-12-05 13:18:00.013620000 +0100
@@ -1,0 +2,13 @@
+Wed Dec 5 09:57:45 CET 2007 - jsuchome@suse.cz
+
+- added command line support (F302395)
+- fixed generating configuration path name (#346152)
+- 2.16.6
+
+-------------------------------------------------------------------
+Mon Dec 3 15:12:11 CET 2007 - jsuchome@suse.cz
+
+- perl-XML-LibXML required for ag_kiwi
+- merged texts from proofread
+
+-------------------------------------------------------------------
Old:
----
yast2-product-creator-2.16.5.tar.bz2
New:
----
yast2-product-creator-2.16.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-product-creator.spec ++++++
--- /var/tmp/diff_new_pack.Q10941/_old 2007-12-05 23:02:46.000000000 +0100
+++ /var/tmp/diff_new_pack.Q10941/_new 2007-12-05 23:02:46.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-product-creator (Version 2.16.5)
+# spec file for package yast2-product-creator (Version 2.16.6)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,16 +11,16 @@
# norootforbuild
Name: yast2-product-creator
-Version: 2.16.5
+Version: 2.16.6
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-product-creator-2.16.5.tar.bz2
+Source0: yast2-product-creator-2.16.6.tar.bz2
Prefix: /usr
BuildRequires: autoyast2-installation perl-XML-Writer update-desktop-files yast2-devtools yast2-packager yast2-security yast2-testsuite
PreReq: %fillup_prereq
-Requires: yast2-packager autoyast2-installation yast2-security
+Requires: yast2-packager autoyast2-installation yast2-security perl-XML-LibXML
# GPG.ycp and GPGWidgets.ycp
Requires: yast2 >= 2.15.2
BuildRequires: yast2 >= 2.15.2
@@ -36,7 +36,7 @@
%prep
-%setup -n yast2-product-creator-2.16.5
+%setup -n yast2-product-creator-2.16.6
%build
%{prefix}/bin/y2tool y2autoconf
@@ -83,6 +83,13 @@
/usr/lib/YaST2/servers_non_y2/ag_*
/var/adm/fillup-templates/sysconfig.product-creator
%changelog
+* Wed Dec 05 2007 - jsuchome@suse.cz
+- added command line support (F302395)
+- fixed generating configuration path name (#346152)
+- 2.16.6
+* Mon Dec 03 2007 - jsuchome@suse.cz
+- perl-XML-LibXML required for ag_kiwi
+- merged texts from proofread
* Mon Nov 12 2007 - lslezak@suse.cz
- select the current language if there is no language selected,
prevent the solver from allocating too much resources (#339756)
++++++ yast2-product-creator-2.16.5.tar.bz2 -> yast2-product-creator-2.16.6.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.5/configure new/yast2-product-creator-2.16.6/configure
--- old/yast2-product-creator-2.16.5/configure 2007-11-12 16:20:26.000000000 +0100
+++ new/yast2-product-creator-2.16.6/configure 2007-10-25 15:23:08.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-product-creator 2.16.5.
+# Generated by GNU Autoconf 2.61 for yast2-product-creator 2.16.0.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-product-creator'
PACKAGE_TARNAME='yast2-product-creator'
-PACKAGE_VERSION='2.16.5'
-PACKAGE_STRING='yast2-product-creator 2.16.5'
+PACKAGE_VERSION='2.16.0'
+PACKAGE_STRING='yast2-product-creator 2.16.0'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-product-creator 2.16.5 to adapt to many kinds of systems.
+\`configure' configures yast2-product-creator 2.16.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-product-creator 2.16.5:";;
+ short | recursive ) echo "Configuration of yast2-product-creator 2.16.0:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-product-creator configure 2.16.5
+yast2-product-creator configure 2.16.0
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-product-creator $as_me 2.16.5, which was
+It was created by yast2-product-creator $as_me 2.16.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-product-creator'
- VERSION='2.16.5'
+ VERSION='2.16.0'
cat >>confdefs.h <<_ACEOF
@@ -2408,7 +2408,7 @@
-VERSION="2.16.5"
+VERSION="2.16.0"
RPMNAME="yast2-product-creator"
MAINTAINER="Ladislav Slezak "
@@ -3303,7 +3303,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-product-creator $as_me 2.16.5, which was
+This file was extended by yast2-product-creator $as_me 2.16.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3346,7 +3346,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-product-creator config.status 2.16.5
+yast2-product-creator config.status 2.16.0
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.5/configure.in new/yast2-product-creator-2.16.6/configure.in
--- old/yast2-product-creator-2.16.5/configure.in 2007-11-12 16:20:21.000000000 +0100
+++ new/yast2-product-creator-2.16.6/configure.in 2007-10-25 15:23:04.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-product-creator, 2.16.5, http://bugs.opensuse.org/, yast2-product-creator)
+AC_INIT(yast2-product-creator, 2.16.0, http://bugs.opensuse.org/, yast2-product-creator)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.16.5"
+VERSION="2.16.0"
RPMNAME="yast2-product-creator"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.5/Makefile.in new/yast2-product-creator-2.16.6/Makefile.in
--- old/yast2-product-creator-2.16.5/Makefile.in 2007-11-12 16:20:30.000000000 +0100
+++ new/yast2-product-creator-2.16.6/Makefile.in 2007-10-25 15:23:11.000000000 +0200
@@ -44,8 +44,8 @@
@CREATE_PKGCONFIG_TRUE@am__append_1 = $(RPMNAME).pc.in
subdir = .
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(top_srcdir)/configure TODO \
- config.guess config.sub install-sh missing
+ $(srcdir)/Makefile.in $(top_srcdir)/configure config.guess \
+ config.sub install-sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.5/src/commandline.ycp new/yast2-product-creator-2.16.6/src/commandline.ycp
--- old/yast2-product-creator-2.16.5/src/commandline.ycp 2007-08-28 08:31:20.000000000 +0200
+++ new/yast2-product-creator-2.16.6/src/commandline.ycp 2007-12-05 11:27:42.000000000 +0100
@@ -9,10 +9,12 @@
{
import "CommandLine";
+ import "FileUtils";
import "Progress";
import "ProductCreator";
- textdomain "product-creator";
+ import "RichText";
+ textdomain "product-creator";
void ProcessConfigFileOption(map params)
{
@@ -32,6 +34,135 @@
}
}
+ /**
+ * Go through the command line parameters map, verify the validity
+ * and fill appropriate gloal values
+ * @param params map with command line parameters
+ * @param action for what action are the parameters intended (create/edit)
+ */
+ boolean ProcessParameters (map params, string action)
+ {
+ string name = params["name"]:"";
+ if (name == "")
+ {
+ // command line error message
+ Report::Error (_("Configuration name is missing."));
+ return false;
+ }
+ map Config = $[
+ "name" : name
+ ];
+
+ if (action != "create" && !haskey (ProductCreator::Configs, name))
+ {
+ // command line error message, %1 is a name
+ Report::Error (sformat (_("There is no configuration %1."), name));
+ return false;
+ }
+ if (action == "edit" || action == "show")
+ {
+ ProductCreator::LoadConfig (name);
+ Config = ProductCreator::Config;
+ }
+ if (action == "show")
+ return true;
+
+ // first, handle required parameters
+ if (params["output_dir"]:"" != "")
+ {
+ Config["iso-directory"] = params["output_dir"]:"";
+ }
+ else if (action == "create")
+ {
+ // command line error message
+ Report::Error (_("Path to output directory is missing."));
+ return false;
+ }
+
+ list<string> repos = splitstring (params["repositories"]:"", ",");
+ if (repos != [])
+ Config["sources"] = repos;
+ else if (action == "create")
+ {
+ // command line error message
+ Report::Error (_("List of package repositories is empty."));
+ return false;
+ }
+
+ if (params["profile"]:"" != "")
+ Config["profile"] = params["profile"]:"";
+ else if (action == "create")
+ {
+ // command line error message
+ Report::Error (_("Path to AutoYaST profile is missing."));
+ return false;
+ }
+ if (haskey (params, "copy_profile"))
+ Config["copy_profile"] = true;
+
+ // there is no manual way for selecting packages:
+ if (action == "create" || params["profile"]:"" != "")
+ {
+ Config["pkgtype"] = "autoyast";
+ ProductCreator::profile_parsed = false;
+ }
+
+ if (params["iso_name"]:"" != "")
+ Config["isofile"] = params["iso_name"]:"";
+ else if (action == "create")
+ Config["isofile"] = name + ".iso";
+
+ if (haskey (params, "create_iso"))
+ Config["result"] = "iso";
+ else if (action == "create")
+ Config["result"] = "tree";
+
+ if (haskey (params, "savespace"))
+ Config["savespace"] = true;
+
+ if (params["gpg_key"]:"" != "")
+ {
+ Config["gpg_key"] = params["gpg_key"]:"";
+ }
+
+ // no selections
+ if (action == "create")
+ Config["type"] = `patterns;
+
+ if (params["isolinux_path"]:"" != "")
+ {
+ string file = params["isolinux_path"]:"";
+ if (!FileUtils::Exists (file))
+ {
+ // command line error message
+ Report::Error (sformat (_("File %1 does not exist."), file));
+ return false;
+ }
+ if (SCR::Read(.target.size, file)> 0)
+ {
+ string cont = (string)SCR::Read (.target.string, file);
+ if (cont != nil)
+ Config["bootconfig"] = cont;
+ }
+ }
+
+ ProductCreator::Config = Config;
+
+ // read default isolinux (Config needs to be saved already to
+ // ProductCreator::Config, it is used by Readisolinux)
+ if (params["isolinux_path"]:"" == "" && action == "create")
+ {
+ ProductCreator::Config["bootconfig"] =
+ ProductCreator::Readisolinux();
+ }
+
+ // save the new configuration into global map, parse autoyast profile
+ ProductCreator::CommitConfig ();
+ }
+
+ /**
+ * Command line handler for List action: list available configurations
+ */
boolean ListHandler(map params)
{
ProcessConfigFileOption(params);
@@ -42,9 +173,12 @@
}
);
- return true;
+ return false; // = do not try to write
}
+ /**
+ * Command line handler for Create ISO action
+ */
boolean CreateIsoHandler(map params)
{
y2milestone("CreateIsoHandler parameters: %1", params);
@@ -60,6 +194,7 @@
if (!ProductCreator::LoadConfig(name))
{
+ // command line error message
CommandLine::Print(sformat(_("Cannot load configuration %1."), name));
return false;
}
@@ -80,6 +215,7 @@
// verify the destination
if (VerifyDialog() != `next)
{
+ // command line error message
CommandLine::Print("Cannot verify the destination");
return false;
}
@@ -94,11 +230,13 @@
integer image_size = (integer)SCR::Read(.target.size, iso_name);
if (SCR::Read(.target.size, iso_name) < 0)
{
+ // command line error message (%1 is path)
CommandLine::Print(sformat(_("Cannot create ISO image %1."), iso_name));
return false;
}
else
{
+ // command line info message
CommandLine::Print(sformat(_("ISO image %1 has been written."), iso_name));
}
@@ -106,10 +244,127 @@
}
else
{
- CommandLine::Print(_("Error: Configuration name cannot be empty."));
+ // command line error message
+ Report::Error (_("Configuration name cannot be empty."));
return false;
}
return true;
}
+
+ /**
+ * Command line handler for Create Config action: create new product
+ * configuration
+ */
+ boolean CreateConfigHandler (map params)
+ {
+ y2milestone ("CreateConfigHandler parameters: %1", params);
+ ProcessConfigFileOption(params);
+
+ return ProcessParameters (params, "create");
+ }
+
+ /**
+ * Command line handler for Delete Config action
+ */
+ boolean DeleteConfigHandler (map params)
+ {
+ y2milestone ("DeleteConfigHandler parameters: %1", params);
+ string name = params["name"]:"";
+
+ if (name == "")
+ {
+ // command line error message
+ Report::Error (_("Configuration name is missing."));
+ return false;
+ }
+ ProductCreator::Configs = filter(string k, map v, ProductCreator::Configs, ``(k!=name));
+ return true;
+ }
+
+ /**
+ * Command line handler for Edit Config action
+ */
+ boolean EditConfigHandler (map params)
+ {
+ y2milestone ("EditConfigHandler parameters: %1", params);
+ ProcessConfigFileOption(params);
+
+ return ProcessParameters (params, "edit");
+ }
+
+ /**
+ * Command line handler for Show Config action
+ */
+ boolean ShowConfigHandler (map params)
+ {
+ y2milestone ("EditConfigHandler parameters: %1", params);
+ ProcessConfigFileOption(params);
+ if (!ProcessParameters (params, "show"))
+ return false;
+
+ // summary caption
+ CommandLine::Print (_("Package Source"));
+ foreach(string s, ProductCreator::Config["sources"]:[], ``{
+ CommandLine::Print ("* " + s);
+ });
+
+
+ /*
+ // summary line (%1 is number)
+ CommandLine::Print (sformat(_("Selected %1 packages"),
+ size (ProductCreator::Config["packages"]:[])));
+ // currently does not have sense: packages from patterns would need
+ // to be counted as well
+ */
+ if (ProductCreator::Config["profile"]:"" != "")
+ {
+ // summary line (%1 is file path)
+ CommandLine::Print (sformat(_("Using AutoYaST profile %1"),
+ ProductCreator::Config["profile"]:""));
+ }
+
+
+ if (ProductCreator::Config["result"]:"tree" == "iso")
+ {
+ // summary line (%1/%2 is file path)
+ CommandLine::Print (sformat(_("Creating ISO image %1/%2"),
+ ProductCreator::Config["iso-directory"]:"",
+ ProductCreator::Config["isofile"]:"") );
+ }
+ else
+ {
+ // summary line (%1/%2 is file path)
+ CommandLine::Print (sformat(_("Creating directory tree in %1/%2"),
+ ProductCreator::Config["iso-directory"]:"",
+ ProductCreator::Config["name"]:"") );
+ }
+
+ string gpgkey = ProductCreator::Config["gpg_key"]:"";
+
+ if (gpgkey != "")
+ {
+ list<map> privatekeys = GPG::PrivateKeys();
+ string uid = "";
+ foreach(map key, privatekeys,
+ {
+ if (key["id"]:"" == gpgkey)
+ {
+ uid = mergestring(key["uid"]:[], ", ");
+ }
+ }
+ );
+ if (uid != "")
+ uid = sformat(" (%1)", uid);
+
+ // summary text - %1 is GPG key ID (e.g. ABCDEF01), %2 is GPG key user ID (or empty if not defined)
+ CommandLine::Print (sformat(_("Digitally sign the medium with GPG key %1%2"), gpgkey, uid));
+ }
+ else
+ {
+ // summary text
+ CommandLine::Print (_("The medium will not be digitally signed"));
+ }
+ return false;
+ }
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.5/src/dialogs.ycp new/yast2-product-creator-2.16.6/src/dialogs.ycp
--- old/yast2-product-creator-2.16.5/src/dialogs.ycp 2007-11-12 16:12:07.000000000 +0100
+++ new/yast2-product-creator-2.16.6/src/dialogs.ycp 2007-12-05 10:10:15.000000000 +0100
@@ -99,7 +99,6 @@
string caption = _("CD Creator Configuration");
- string source = ProductCreator::Config["source"]:"";
string name = ProductCreator::Config["name"]:"";
string pkgtype = ProductCreator::Config["pkgtype"]:"package-manager";
@@ -268,7 +267,6 @@
string publisher = ProductCreator::Config["publisher"]:"";
string preparer = ProductCreator::Config["preparer"]:"";
string result = ProductCreator::Config["result"]:"iso";
- string db = ProductCreator::Config["database"]:"original";
string isofile_path = ProductCreator::Config["isofile"]:"";
boolean savespace = ProductCreator::Config["savespace"]:false;
@@ -1349,10 +1347,24 @@
// summary caption
summary = Summary::AddHeader(summary,_("Output Directory"));
- // summary line
- summary = Summary::AddLine(summary,sformat(_("Creating directory tree in <b> %1/%2 </b>"),
+ if (ProductCreator::Config["result"]:"tree" == "iso")
+ {
+ summary = Summary::AddLine (summary,
+ // summary line (%1/%2 is file path)
+ sformat (_("Creating ISO image %1/%2"),
+ ProductCreator::Config["iso-directory"]:"",
+ ProductCreator::Config["isofile"]:"")
+ );
+ }
+ else
+ {
+ summary = Summary::AddLine (summary,
+ // summary line (%1/%2 is file path)
+ sformat(_("Creating directory tree in <b> %1/%2 </b>"),
ProductCreator::Config["iso-directory"]:"",
- ProductCreator::Config["name"]:"") );
+ ProductCreator::Config["name"]:"")
+ );
+ }
// header in the summary dialog
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.5/src/helps.ycp new/yast2-product-creator-2.16.6/src/helps.ycp
--- old/yast2-product-creator-2.16.5/src/helps.ycp 2007-07-16 15:53:26.000000000 +0200
+++ new/yast2-product-creator-2.16.6/src/helps.ycp 2007-09-13 09:36:17.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Help texts of all the dialogs
* Authors: Anas Nashif
*
- * $Id: helps.ycp 38497 2007-06-18 09:29:24Z jsuchome $
+ * $Id: helps.ycp 38945 2007-06-21 12:19:17Z jsuchome $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.5/src/kiwi_dialogs.ycp new/yast2-product-creator-2.16.6/src/kiwi_dialogs.ycp
--- old/yast2-product-creator-2.16.5/src/kiwi_dialogs.ycp 2007-11-12 15:47:32.000000000 +0100
+++ new/yast2-product-creator-2.16.6/src/kiwi_dialogs.ycp 2007-12-05 11:31:06.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Dialogs for kiwi configuration
* Authors: Jiri Suchomel
*
- * $Id: kiwi_dialogs.ycp 41969 2007-11-12 14:19:15Z jsuchome $
+ * $Id: kiwi_dialogs.ycp 42603 2007-12-03 14:13:29Z jsuchome $
*/
{
textdomain "product-creator";
@@ -799,9 +799,10 @@
map read_config = Kiwi::ReadConfigXML (kiwi_configuration);
if (!KiwiConfig["_imported"]:false)
{
- KiwiConfig = (map) union (
- // "type" had different meaning in ProductCreator::Config...
- remove (KiwiConfig, "type"), read_config);
+ // "type" had different meaning in ProductCreator::Config...
+ if (haskey (KiwiConfig, "type"))
+ KiwiConfig = remove (KiwiConfig, "type");
+ KiwiConfig = (map) union (KiwiConfig, read_config);
// for new configuration, do not read all from the template
y2milestone ("product-creator based configuration...");
foreach (string key, ["addons", "packages", "sources"], {
@@ -1036,7 +1037,7 @@
// combo box label
"label" : _("&USB Stick Boot Image"),
// help text for "XEN Boot Image"
- "help" : sformat (_("<p>Choose one <b>USB stick Boot Image</b> from the<br>
+ "help" : sformat (_("<p>Choose one <b>USB Stick Boot Image</b> from the<br>
<tt>%1/%2</tt><br>
directory.</p>
"),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.5/src/Kiwi.ycp new/yast2-product-creator-2.16.6/src/Kiwi.ycp
--- old/yast2-product-creator-2.16.5/src/Kiwi.ycp 2007-11-12 15:47:32.000000000 +0100
+++ new/yast2-product-creator-2.16.6/src/Kiwi.ycp 2007-12-05 12:30:55.000000000 +0100
@@ -716,7 +716,7 @@
if (!FileUtils::Exists (images_dir))
SCR::Execute (.target.mkdir, images_dir);
SCR::Execute (.target.bash, sformat ("cp -ar %1 %2/", config_dir, images_dir));
- return (images_dir + KiwiConfig["name"]:"");
+ return (images_dir + "/" + KiwiConfig["name"]:"");
}
/**
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.5/src/product-creator.ycp new/yast2-product-creator-2.16.6/src/product-creator.ycp
--- old/yast2-product-creator-2.16.5/src/product-creator.ycp 2007-09-27 16:06:28.000000000 +0200
+++ new/yast2-product-creator-2.16.6/src/product-creator.ycp 2007-12-05 10:21:30.000000000 +0100
@@ -34,16 +34,36 @@
"initialize" : ProductCreator::Read,
"finish" : ProductCreator::Write,
"actions" : $[
- "list" :$[
+ "list" : $[
"handler" : ListHandler,
- // translators: command line help text for summary action
+ // translators: command line help text for list action
"help" : _("Print existing configurations")
],
- "create-iso" :$[
+ "create-iso" : $[
"handler" : CreateIsoHandler,
- // translators: command line help text for summary action
+ // translators: command line help text for create-iso action
"help" : _("Create installation ISO image")
- ]
+ ],
+ "create" : $[
+ "handler" : CreateConfigHandler,
+ // translators: command line help text for create-config action
+ "help" : _("Create new product configuration")
+ ],
+ "delete" : $[
+ "handler" : DeleteConfigHandler,
+ // translators: command line help text for delete-config action
+ "help" : _("Delete existing configuration")
+ ],
+ "edit" : $[
+ "handler" : EditConfigHandler,
+ // translators: command line help text for delete-config action
+ "help" : _("Edit existing configuration")
+ ],
+ "show" : $[
+ "handler" : ShowConfigHandler,
+ // translators: command line help text for show action
+ "help" : _("Show the summary of selected configuration")
+ ],
],
"options" : $[
"name" : $[
@@ -52,7 +72,7 @@
"type" : "string"
],
"passphrase" : $[
- // translators: command line help text for the 'passhrase' option
+ // translators: command line help text for the 'passphrase' option
"help" : _("GPG passhrase required for signing the source."),
"type" : "string"
],
@@ -66,11 +86,64 @@
"help" : sformat(_("Path to the configuration file (default is %1"),
ProductCreator::ConfigFile),
"type" : "string"
- ]
+ ],
+ "output_dir" : $[
+ // command line help text for 'output_dir' option
+ "help" : _("Path to the output directory"),
+ "type" : "string"
+ ],
+ // TODO provide also for create-iso...?
+ "create_iso" : $[
+ // command line help text for 'create_iso' option
+ "help" : _("Output should be ISO image instead of directory tree"),
+ ],
+ "iso_name" : $[
+ // command line help text for 'iso_name' option
+ "help" : _("Name of the output ISO image"),
+ "type" : "string",
+ ],
+ "savespace" : $[
+ // command line help text for 'savespace' option
+ "help" : _("Copy only needed files to save space"),
+ ],
+ "profile" : $[
+ // command line help text for 'profile' option
+ "help" : _("Path to AutoYaST profile"),
+ "type" : "string"
+ ],
+ "copy_profile" : $[
+ // command line help text for 'copy_profile' option
+ "help" : _("Copy AutoYaST profile to CD image"),
+ ],
+ "isolinux_path" : $[
+ // command line help text for 'isolinux_path' option
+ "help" : _("Path to isolinux.cfg file"),
+ "type" : "string"
+ ],
+ "gpg_key" : $[
+ // command line help text for 'gpg_key' option
+ "help" : _("GPG key ID used to sign a product"),
+ "type" : "string",
+ ],
+ "repositories" : $[
+ // command line help text for 'repositories' option
+ "help" : _("List of package repositories (separated by commas)"),
+ "type" : "string"
+ ],
],
"mappings" : $[
"list" : ["configfile"],
"create-iso" : ["name", "passphrase", "passphrase_file", "configfile"],
+ "create" : ["name", "configfile", "output_dir", "create_iso",
+ "iso_name", "savespace", "profile", "copy_profile", "isolinux_path",
+ "gpg_key", "repositories",
+ ],
+ "edit" : ["name", "configfile", "output_dir", "create_iso",
+ "iso_name", "savespace", "profile", "copy_profile", "isolinux_path",
+ "gpg_key", "repositories",
+ ],
+ "delete" : ["name"],
+ "show" : ["name"],
]
];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.5/src/ProductCreator.ycp new/yast2-product-creator-2.16.6/src/ProductCreator.ycp
--- old/yast2-product-creator-2.16.5/src/ProductCreator.ycp 2007-11-12 16:12:07.000000000 +0100
+++ new/yast2-product-creator-2.16.6/src/ProductCreator.ycp 2007-12-05 10:13:33.000000000 +0100
@@ -164,8 +164,13 @@
symbol autoyastPackages ()
{
string base_selection = "";
- //Pkg::TargetFinish ();
- Popup::ShowFeedback(_("Reading data from Package Database..."), _("Please wait..."));
+ // busy message
+ string feedback = _("Reading data from Package Database...");
+ if (Mode::commandline())
+ CommandLine::PrintVerbose (feedback);
+ else
+ // popup
+ Popup::ShowFeedback (feedback, _("Please wait..."));
Pkg::TargetFinish ();
string tmp = (string)SCR::Read( .target.tmpdir );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.5/src/routines.ycp new/yast2-product-creator-2.16.6/src/routines.ycp
--- old/yast2-product-creator-2.16.5/src/routines.ycp 2007-07-16 15:53:26.000000000 +0200
+++ new/yast2-product-creator-2.16.6/src/routines.ycp 2007-09-13 09:36:17.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Miscelanous functions for configuration of product-creator.
* Authors: Anas Nashif
*
- * $Id: routines.ycp 37838 2007-05-04 13:18:14Z lslezak $
+ * $Id: routines.ycp 38945 2007-06-21 12:19:17Z jsuchome $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.5/TODO new/yast2-product-creator-2.16.6/TODO
--- old/yast2-product-creator-2.16.5/TODO 2007-11-09 16:26:08.000000000 +0100
+++ new/yast2-product-creator-2.16.6/TODO 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-Do the same for s390 and s390x:
-
-+ // ppc64 has /boot/ppc
-+ string boot_architecture = (arch == "ppc64") ? "ppc" : arch;
-+
-+ if (bootable_product && Config["code10"]:false)
- {
-- Exec(sformat("/bin/mkdir -p '%1/boot/%2'", String::Quote(skel_root), String::Quote(arch)));
-+ Exec(sformat("/bin/mkdir -p '%1/boot/%2'", String::Quote(skel_root), String::Quote(boot_architecture)));
- }
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.5/VERSION new/yast2-product-creator-2.16.6/VERSION
--- old/yast2-product-creator-2.16.5/VERSION 2007-11-12 16:19:33.000000000 +0100
+++ new/yast2-product-creator-2.16.6/VERSION 2007-12-05 09:58:34.000000000 +0100
@@ -1 +1 @@
-2.16.5
+2.16.6
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org