Hello community,
here is the log from the commit of package yast2-product-creator
checked in at Tue Mar 11 17:07:56 CET 2008.
--------
--- yast2-product-creator/yast2-product-creator.changes 2008-02-06 13:38:09.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-product-creator/yast2-product-creator.changes 2008-03-11 13:41:40.944598000 +0100
@@ -1,0 +2,12 @@
+Tue Mar 11 13:37:26 CET 2008 - lslezak@suse.cz
+
+- adapted to the new ProgressDownload callback signature (#168935)
+- 2.16.9
+
+-------------------------------------------------------------------
+Mon Feb 18 10:53:37 CET 2008 - lslezak@suse.cz
+
+- adapted to the new plaindir API in SourceDialogs module
+ (use SourceDialogs::IsPlainDir() to get the plaindir flag)
+
+-------------------------------------------------------------------
Old:
----
yast2-product-creator-2.16.8.tar.bz2
New:
----
yast2-product-creator-2.16.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-product-creator.spec ++++++
--- /var/tmp/diff_new_pack.D20480/_old 2008-03-11 17:07:51.000000000 +0100
+++ /var/tmp/diff_new_pack.D20480/_new 2008-03-11 17:07:51.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-product-creator (Version 2.16.8)
+# spec file for package yast2-product-creator (Version 2.16.5)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -10,17 +10,18 @@
# norootforbuild
+
Name: yast2-product-creator
-Version: 2.16.8
-Release: 1
+Version: 2.16.5
+Release: 11
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-product-creator-2.16.8.tar.bz2
+Source0: yast2-product-creator-2.16.5.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 perl-XML-LibXML
+Requires: yast2-packager autoyast2-installation yast2-security
# GPG.ycp and GPGWidgets.ycp
Requires: yast2 >= 2.15.2
BuildRequires: yast2 >= 2.15.2
@@ -36,7 +37,7 @@
%prep
-%setup -n yast2-product-creator-2.16.8
+%setup -n yast2-product-creator-2.16.5
%build
%{prefix}/bin/y2tool y2autoconf
@@ -83,6 +84,12 @@
/usr/lib/YaST2/servers_non_y2/ag_*
/var/adm/fillup-templates/sysconfig.product-creator
%changelog
+* Tue Mar 11 2008 lslezak@suse.cz
+- adapted to the new ProgressDownload callback signature (#168935)
+- 2.16.9
+* Mon Feb 18 2008 lslezak@suse.cz
+- adapted to the new plaindir API in SourceDialogs module
+ (use SourceDialogs::IsPlainDir() to get the plaindir flag)
* Wed Feb 06 2008 jsuchome@suse.cz
- save user password when importing configuration (bnc#357922)
- 2.16.8
++++++ yast2-product-creator-2.16.8.tar.bz2 -> yast2-product-creator-2.16.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.8/agent-kiwi/ag_kiwi new/yast2-product-creator-2.16.5/agent-kiwi/ag_kiwi
--- old/yast2-product-creator-2.16.8/agent-kiwi/ag_kiwi 2008-01-25 15:41:21.000000000 +0100
+++ new/yast2-product-creator-2.16.5/agent-kiwi/ag_kiwi 2007-11-09 10:19:15.000000000 +0100
@@ -60,8 +60,7 @@
}
my $prefs = $optionsNodeList -> get_node(1);
foreach my $tag ("packagemanager", "version", "rpm-check-signatures",
- "rpm-force", "size", "defaultdestination", "defaultroot", "locale",
- "timezone", "keytable")
+ "rpm-force", "size", "defaultdestination", "defaultroot", "locale")
{
my $element = $prefs -> getElementsByTagName ($tag);
$retmap{$tag} = $element->get_node(1)->textContent () if ($element);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.8/configure new/yast2-product-creator-2.16.5/configure
--- old/yast2-product-creator-2.16.8/configure 2007-10-25 15:23:08.000000000 +0200
+++ new/yast2-product-creator-2.16.5/configure 2007-11-12 16:20:26.000000000 +0100
@@ -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.0.
+# Generated by GNU Autoconf 2.61 for yast2-product-creator 2.16.5.
#
# 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.0'
-PACKAGE_STRING='yast2-product-creator 2.16.0'
+PACKAGE_VERSION='2.16.5'
+PACKAGE_STRING='yast2-product-creator 2.16.5'
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.0 to adapt to many kinds of systems.
+\`configure' configures yast2-product-creator 2.16.5 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.0:";;
+ short | recursive ) echo "Configuration of yast2-product-creator 2.16.5:";;
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.0
+yast2-product-creator configure 2.16.5
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.0, which was
+It was created by yast2-product-creator $as_me 2.16.5, 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.0'
+ VERSION='2.16.5'
cat >>confdefs.h <<_ACEOF
@@ -2408,7 +2408,7 @@
-VERSION="2.16.0"
+VERSION="2.16.5"
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.0, which was
+This file was extended by yast2-product-creator $as_me 2.16.5, 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.0
+yast2-product-creator config.status 2.16.5
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.8/configure.in new/yast2-product-creator-2.16.5/configure.in
--- old/yast2-product-creator-2.16.8/configure.in 2007-10-25 15:23:04.000000000 +0200
+++ new/yast2-product-creator-2.16.5/configure.in 2007-11-12 16:20:21.000000000 +0100
@@ -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.0, http://bugs.opensuse.org/, yast2-product-creator)
+AC_INIT(yast2-product-creator, 2.16.5, 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.0"
+VERSION="2.16.5"
RPMNAME="yast2-product-creator"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.8/Makefile.in new/yast2-product-creator-2.16.5/Makefile.in
--- old/yast2-product-creator-2.16.8/Makefile.in 2007-10-25 15:23:11.000000000 +0200
+++ new/yast2-product-creator-2.16.5/Makefile.in 2007-11-12 16:20:30.000000000 +0100
@@ -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 config.guess \
- config.sub install-sh missing
+ $(srcdir)/Makefile.in $(top_srcdir)/configure TODO \
+ 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.8/src/commandline.ycp new/yast2-product-creator-2.16.5/src/commandline.ycp
--- old/yast2-product-creator-2.16.8/src/commandline.ycp 2007-12-05 11:27:42.000000000 +0100
+++ new/yast2-product-creator-2.16.5/src/commandline.ycp 2007-08-28 08:31:20.000000000 +0200
@@ -9,13 +9,11 @@
{
import "CommandLine";
- import "FileUtils";
import "Progress";
import "ProductCreator";
- import "RichText";
-
textdomain "product-creator";
+
void ProcessConfigFileOption(map params)
{
if (haskey(params, "configfile"))
@@ -34,135 +32,6 @@
}
}
- /**
- * 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);
@@ -173,12 +42,9 @@
}
);
- return false; // = do not try to write
+ return true;
}
- /**
- * Command line handler for Create ISO action
- */
boolean CreateIsoHandler(map params)
{
y2milestone("CreateIsoHandler parameters: %1", params);
@@ -194,7 +60,6 @@
if (!ProductCreator::LoadConfig(name))
{
- // command line error message
CommandLine::Print(sformat(_("Cannot load configuration %1."), name));
return false;
}
@@ -215,7 +80,6 @@
// verify the destination
if (VerifyDialog() != `next)
{
- // command line error message
CommandLine::Print("Cannot verify the destination");
return false;
}
@@ -230,13 +94,11 @@
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));
}
@@ -244,127 +106,10 @@
}
else
{
- // command line error message
- Report::Error (_("Configuration name cannot be empty."));
+ CommandLine::Print(_("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.8/src/dialogs.ycp new/yast2-product-creator-2.16.5/src/dialogs.ycp
--- old/yast2-product-creator-2.16.8/src/dialogs.ycp 2008-01-04 14:14:48.000000000 +0100
+++ new/yast2-product-creator-2.16.5/src/dialogs.ycp 2007-11-12 16:12:07.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Anas Nashif
*
- * $Id: dialogs.ycp 43273 2008-01-04 12:32:12Z lslezak $
+ * $Id: dialogs.ycp 41978 2007-11-12 15:12:05Z lslezak $
*/
{
@@ -99,6 +99,7 @@
string caption = _("CD Creator Configuration");
+ string source = ProductCreator::Config["source"]:"";
string name = ProductCreator::Config["name"]:"";
string pkgtype = ProductCreator::Config["pkgtype"]:"package-manager";
@@ -267,6 +268,7 @@
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;
@@ -772,6 +774,8 @@
**/
symbol detailedSelection( symbol mode )
{
+ Pkg::SaveState();
+
// Open empty dialog for instant feedback
UI::OpenDialog(`opt(`defaultsize),
@@ -792,6 +796,11 @@
UI::CloseDialog();
y2milestone( "Package selector returned %1", result );
+ if (result == `accept)
+ Pkg::ClearSaveState();
+ else
+ Pkg::RestoreState(false);
+
return result;
}
@@ -1340,24 +1349,10 @@
// summary caption
summary = Summary::AddHeader(summary,_("Output Directory"));
- 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>"),
+ // summary line
+ summary = Summary::AddLine(summary,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.8/src/helps.ycp new/yast2-product-creator-2.16.5/src/helps.ycp
--- old/yast2-product-creator-2.16.8/src/helps.ycp 2007-09-13 09:36:17.000000000 +0200
+++ new/yast2-product-creator-2.16.5/src/helps.ycp 2007-07-16 15:53:26.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Help texts of all the dialogs
* Authors: Anas Nashif
*
- * $Id: helps.ycp 38945 2007-06-21 12:19:17Z jsuchome $
+ * $Id: helps.ycp 38497 2007-06-18 09:29:24Z jsuchome $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.8/src/kiwi_dialogs.ycp new/yast2-product-creator-2.16.5/src/kiwi_dialogs.ycp
--- old/yast2-product-creator-2.16.8/src/kiwi_dialogs.ycp 2008-02-06 11:12:26.000000000 +0100
+++ new/yast2-product-creator-2.16.5/src/kiwi_dialogs.ycp 2007-11-12 15:47:32.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Dialogs for kiwi configuration
* Authors: Jiri Suchomel
*
- * $Id: kiwi_dialogs.ycp 43691 2008-01-17 09:42:02Z jsuchome $
+ * $Id: kiwi_dialogs.ycp 41969 2007-11-12 14:19:15Z jsuchome $
*/
{
textdomain "product-creator";
@@ -336,7 +336,7 @@
define void InitUsersTable (string id) {
list items = maplist (string user, map usermap, (map) KiwiConfig["users"]:$[],
- ``(`item (`id (user), user, usermap["home"]:"", usermap["group"]:"users")));
+ ``(`item (`id (user), user, usermap["home"]:"")));
UI::ChangeWidget (`id ("table"), `Items, items);
UI::ChangeWidget (`id ("edituser"), `Enabled, size (items) > 0);
UI::ChangeWidget (`id ("deleteuser"), `Enabled, size (items) > 0);
@@ -360,7 +360,6 @@
`Password (`id (`pw1), Label::Password(), ""),
`Password (`id(`pw2), Label::ConfirmPassword(), ""),
`TextEntry (`id (`home), _("&Home Directory")),
- `TextEntry (`id (`group), _("&Group Name")),
`HBox (
`PushButton (`id(`ok),`opt(`key_F10), Label::OKButton()),
`PushButton (`id(`cancel),`opt(`key_F9), Label::CancelButton())
@@ -371,7 +370,6 @@
{
UI::ChangeWidget (`id (`username), `Value, current_user);
UI::ChangeWidget (`id (`home), `Value, KiwiConfig["users", current_user, "home"]:"");
- UI::ChangeWidget (`id (`group), `Value, KiwiConfig["users", current_user, "group"]:"users");
UI::ChangeWidget (`id (`pw1), `Value, "*****");
UI::ChangeWidget (`id (`pw2), `Value, "*****");
// popup label
@@ -411,15 +409,9 @@
KiwiConfig["users"] = $[];
else if (key == "edituser" && username != current_user)
KiwiConfig["users"] = remove (KiwiConfig["users"]:$[], current_user);
- string group = (string) UI::QueryWidget (`id(`group), `Value);
- if (group == "")
- group = username == "root" ? "root" : "users";
KiwiConfig["users", username] = $[
"pwd" : pwd,
- "encrypted" : false,
- "home" : UI::QueryWidget (`id(`home), `Value),
- "group" : group,
- "username" : username,
+ "home" : UI::QueryWidget (`id(`home), `Value)
];
}
} until (ret == `ok || ret == `cancel);
@@ -807,10 +799,9 @@
map read_config = Kiwi::ReadConfigXML (kiwi_configuration);
if (!KiwiConfig["_imported"]:false)
{
- // "type" had different meaning in ProductCreator::Config...
- if (haskey (KiwiConfig, "type"))
- KiwiConfig = remove (KiwiConfig, "type");
- KiwiConfig = (map) union (KiwiConfig, read_config);
+ KiwiConfig = (map) union (
+ // "type" had different meaning in ProductCreator::Config...
+ remove (KiwiConfig, "type"), read_config);
// for new configuration, do not read all from the template
y2milestone ("product-creator based configuration...");
foreach (string key, ["addons", "packages", "sources"], {
@@ -942,7 +933,7 @@
`VBox (
"general_users",
`VSpacing (0.2),
-// "group",
+ "group",
`VSpacing (0.2),
"userstable",
`VSpacing (0.2),
@@ -1045,7 +1036,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>
"),
@@ -1354,7 +1345,6 @@
// general help for users tab
"help" : _("<p>Here, create users that should be available in the target system.</p>"),
],
- /*
"group" : $[
"widget" : `textentry,
// textentry label
@@ -1364,20 +1354,15 @@
"store" : StoreDescription,
"handle" : HandleDescription,
],
- */
"userstable" : $[
"widget" : `custom,
"custom_widget" : `Table (`id("table"), `opt (`notify), `header(
// table header
_("Name"),
// table header
- _("Home Directory"),
- // table header
- _("Group"))
- ),
+ _("Home Directory"))),
// help for table with users
- "help" : _("<p>For each user, specify <b>Name</b>, <b>Password</b>, <b>Home Directory</b> and group
-to which the users belongs.</p>"),
+ "help" : _("<p>For each user, specify <b>Name</b>, <b>Password</b>, and <b>Home Directory</b>.</p>"),
"init" : InitUsersTable,
"handle" : HandleAddEditUser,
],
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.8/src/Kiwi.ycp new/yast2-product-creator-2.16.5/src/Kiwi.ycp
--- old/yast2-product-creator-2.16.8/src/Kiwi.ycp 2008-02-06 11:12:26.000000000 +0100
+++ new/yast2-product-creator-2.16.5/src/Kiwi.ycp 2007-11-12 15:47:32.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Data for kiwi configuration, input and output functions.
* Authors: Jiri Suchomel
*
- * $Id: Kiwi.ycp 43917 2008-01-25 15:25:24Z jsuchome $
+ * $Id: Kiwi.ycp 41969 2007-11-12 14:19:15Z jsuchome $
*/
{
module "Kiwi";
@@ -312,8 +312,7 @@
foreach (string key, [ "author", "contact", "image_type", "specification",
"packagemanager", "version", "rpm-check-signatures", "rpm-force",
"sizeunit", "type", "name", "repository", "defaultdestination",
- "schemeversion", "defaultroot", "inherit", "locale", "timezone",
- "keytable"],
+ "schemeversion", "defaultroot", "inherit", "locale"],
{
if (config[key]:nil != nil)
ret[key] = config[key]:nil;
@@ -325,14 +324,11 @@
foreach (string user, map usermap, (map) config["users"]:$[], {
if (!haskey (ret, "users"))
ret["users"] = $[];
- string pwd = usermap["pwd"]:"";
- boolean crypted = (pwd != "");
+ if (haskey (usermap, "group"))
+ ret["group"] = usermap["group"]:"";
ret["users",user] = $[
"home" : usermap["home"]:sformat ("/home/%1", user),
- "pwd" : (pwd == "") ? user : pwd,
- "encrypted" : crypted,
- "group" : usermap["group"]:"",
- "username" : user,
+ "pwd" : user
];
});
return ret;
@@ -426,7 +422,6 @@
])
);
- // for the order of keys in preferences section, see bug 355568
map preferences = $[
"__key" : "preferences",
"__children" : [
@@ -457,24 +452,24 @@
],
],
];
- // "type" goes to the first place
foreach (map typemap, get_type_values (KiwiConfig, task), {
preferences["__children"] = prepend (preferences["__children"]:[],
typemap);
});
- // iso-directory is the correct value, it could have been altered via UI
- KiwiConfig["defaultdestination"] = KiwiConfig["iso-directory"]:"";
- foreach (string key, [ "keytable", "timezone", "locale",
- "defaultdestination", "defaultroot" ],
+ if (KiwiConfig["defaultroot"]:"" != "")
{
- if (KiwiConfig[key]:"" != "")
- {
- preferences["__children"] = add (preferences["__children"]:[], $[
- "__key" : key,
- "__value" : KiwiConfig[key]:"",
- ]);
- }
- });
+ preferences["__children"] = add (preferences["__children"]:[], $[
+ "__key" : "defaultroot",
+ "__value" : KiwiConfig["defaultroot"]:"",
+ ]);
+ }
+ if (KiwiConfig["locale"]:"" != "")
+ {
+ preferences["__children"] = add (preferences["__children"]:[], $[
+ "__key" : "locale",
+ "__value" : KiwiConfig["locale"]:"",
+ ]);
+ }
@@ -508,29 +503,19 @@
write_list[0,"inherit"] = KiwiConfig["inherit"]:"";
if (haskey (KiwiConfig, "users"))
{
- map groups2users = $[];
- foreach (string user, map usermap, (map) KiwiConfig["users"]:$[], {
- string g = usermap["group"]:"";
- if (g == "")
- g = user == "root" ? "root" : "users";
- if (!haskey (groups2users, g))
- groups2users[g] = [];
- groups2users[g] = add (groups2users[g]:[], usermap);
- });
- foreach (string group, list userlist, groups2users, {
- write_list[0,"__children"] = add (write_list[0,"__children"]:[], $[
- "__key" : "users",
- "group" : group,
- "__children" : maplist (map usermap, (list<map>) userlist, ``(
+ write_list[0,"__children"] = add (write_list[0,"__children"]:[], $[
+ "__key" : "users",
+ "group" : KiwiConfig["group"]:"users",
+ "__children" :
+ maplist (string user, map usermap, (map) KiwiConfig["users"]:$[], ``(
$[
"__key" : "user",
- "name" : usermap["username"]:"",
- "pwd" : (usermap["encrypted"]:false) ? usermap["pwd"]:"" : crypt_password (usermap["pwd"]:""),
+ "name" : user,
+ "pwd" : crypt_password (usermap["pwd"]:""),
"home" : usermap["home"]:"",
]
))
- ]);
- });
+ ]);
}
write_list[0,"__children"] = union (write_list[0,"__children"]:[],
maplist (string source, (list<string>) KiwiConfig["sources"]:[],
@@ -731,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.8/src/product-creator.ycp new/yast2-product-creator-2.16.5/src/product-creator.ycp
--- old/yast2-product-creator-2.16.8/src/product-creator.ycp 2007-12-05 13:18:17.000000000 +0100
+++ new/yast2-product-creator-2.16.5/src/product-creator.ycp 2007-09-27 16:06:28.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Main file
* Authors: Anas Nashif
*
- * $Id: product-creator.ycp 42709 2007-12-05 12:18:17Z jsuchome $
+ * $Id: product-creator.ycp 41146 2007-09-27 14:06:28Z lslezak $
*
* Main file for product-creator configuration. Uses all other files.
*/
@@ -34,36 +34,16 @@
"initialize" : ProductCreator::Read,
"finish" : ProductCreator::Write,
"actions" : $[
- "list" : $[
+ "list" :$[
"handler" : ListHandler,
- // translators: command line help text for list action
+ // translators: command line help text for summary action
"help" : _("Print existing configurations")
],
- "create-iso" : $[
+ "create-iso" :$[
"handler" : CreateIsoHandler,
- // translators: command line help text for create-iso action
+ // translators: command line help text for summary 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" : $[
@@ -72,7 +52,7 @@
"type" : "string"
],
"passphrase" : $[
- // translators: command line help text for the 'passphrase' option
+ // translators: command line help text for the 'passhrase' option
"help" : _("GPG passhrase required for signing the source."),
"type" : "string"
],
@@ -86,64 +66,11 @@
"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.8/src/ProductCreator.ycp new/yast2-product-creator-2.16.5/src/ProductCreator.ycp
--- old/yast2-product-creator-2.16.8/src/ProductCreator.ycp 2007-12-05 13:18:17.000000000 +0100
+++ new/yast2-product-creator-2.16.5/src/ProductCreator.ycp 2007-11-12 16:12:07.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Data for configuration of product-creator, input and output functions.
* Authors: Anas Nashif
*
- * $Id: ProductCreator.ycp 42709 2007-12-05 12:18:17Z jsuchome $
+ * $Id: ProductCreator.ycp 41978 2007-11-12 15:12:05Z lslezak $
*
* Representation of the configuration of product-creator.
* Input and output routines.
@@ -164,13 +164,8 @@
symbol autoyastPackages ()
{
string base_selection = "";
- // busy message
- string feedback = _("Reading data from Package Database...");
- if (Mode::commandline())
- CommandLine::PrintVerbose (feedback);
- else
- // popup
- Popup::ShowFeedback (feedback, _("Please wait..."));
+ //Pkg::TargetFinish ();
+ Popup::ShowFeedback(_("Reading data from Package Database..."), _("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.8/src/routines.ycp new/yast2-product-creator-2.16.5/src/routines.ycp
--- old/yast2-product-creator-2.16.8/src/routines.ycp 2007-09-13 09:36:17.000000000 +0200
+++ new/yast2-product-creator-2.16.5/src/routines.ycp 2007-07-16 15:53:26.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Miscelanous functions for configuration of product-creator.
* Authors: Anas Nashif
*
- * $Id: routines.ycp 38945 2007-06-21 12:19:17Z jsuchome $
+ * $Id: routines.ycp 37838 2007-05-04 13:18:14Z lslezak $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.8/TODO new/yast2-product-creator-2.16.5/TODO
--- old/yast2-product-creator-2.16.8/TODO 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-product-creator-2.16.5/TODO 2007-11-09 16:26:08.000000000 +0100
@@ -0,0 +1,11 @@
+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.8/VERSION new/yast2-product-creator-2.16.5/VERSION
--- old/yast2-product-creator-2.16.8/VERSION 2008-02-06 13:30:50.000000000 +0100
+++ new/yast2-product-creator-2.16.5/VERSION 2007-11-12 16:19:33.000000000 +0100
@@ -1 +1 @@
-2.16.8
+2.16.5
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org