Hello community,
here is the log from the commit of package yast2-product-creator for
openSUSE:Factory
checked in at Tue Oct 4 18:02:22 CEST 2011.
--------
--- openSUSE:Factory/yast2-product-creator/yast2-product-creator.changes
2011-09-23 12:53:20.000000000 +0200
+++
/mounts/work_src_done/STABLE/yast2-product-creator/yast2-product-creator.changes
2011-09-27 15:01:40.000000000 +0200
@@ -1,0 +2,15 @@
+Tue Sep 27 15:00:13 CEST 2011 - [email protected]
+
+- set dialog title
+- 2.21.11
+
+-------------------------------------------------------------------
+Fri Sep 23 10:04:48 UTC 2011 - [email protected]
+
+- code cleanup - removed obsoled code for handling selections
+ (replaced by patterns long time ago)
+- use Pkg::ResolvableProperties() instead of obsoleted
+ Pkg::GetPatterns()
+- 2.21.10
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-product-creator-2.21.9.tar.bz2
New:
----
yast2-product-creator-2.21.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-product-creator.spec ++++++
--- /var/tmp/diff_new_pack.B9oUB6/_old 2011-10-04 18:02:18.000000000 +0200
+++ /var/tmp/diff_new_pack.B9oUB6/_new 2011-10-04 18:02:18.000000000 +0200
@@ -19,11 +19,11 @@
Name: yast2-product-creator
-Version: 2.21.9
+Version: 2.21.11
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-product-creator-2.21.9.tar.bz2
+Source0: yast2-product-creator-%{version}.tar.bz2
Prefix: /usr
@@ -43,6 +43,7 @@
# changes in ag_anyxml agent
# Wizard_hw drop
+# Wizard::SetDesktopTitleAndIcon
Requires: yast2 >= 2.21.22
# Pkg::SourceForceRefreshNow()
@@ -63,7 +64,7 @@
XEN images etc.), based on existing installation sources.
%prep
-%setup -n yast2-product-creator-2.21.9
+%setup -n yast2-product-creator-%{version}
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-product-creator-2.21.9.tar.bz2 ->
yast2-product-creator-2.21.11.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-2.21.9/Makefile.am
new/yast2-product-creator-2.21.11/Makefile.am
--- old/yast2-product-creator-2.21.9/Makefile.am 2011-09-15
21:21:12.000000000 +0200
+++ new/yast2-product-creator-2.21.11/Makefile.am 2011-09-27
14:56:05.000000000 +0200
@@ -20,7 +20,6 @@
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
DEVTOOLS_DIR = $(if
$(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
-ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if
$(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
COPYRIGHT_files_gpl = README COPYING
@@ -155,7 +154,7 @@
$(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain
package-local
+package: check-up-to-date check-tagversion check-textdomain package-local
TAGVERSION = $(Y2TOOL) tagversion
@@ -185,21 +184,6 @@
check-parse:
@echo "Not running parseycp."
-check-all-packages:
- @if [ ! -e "$(ALL_PACKAGES)" ]; then \
- echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \
- fi
- @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then
\
- echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \
- fi
- @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \
- echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some
unknown (?) fields:"; \
- echo; \
- grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \
- echo; \
- false; \
- fi
-
check-textdomain:
$(Y2TOOL) check-textdomain $(srcdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-2.21.9/Makefile.in
new/yast2-product-creator-2.21.11/Makefile.in
--- old/yast2-product-creator-2.21.9/Makefile.in 2011-09-15
21:21:16.000000000 +0200
+++ new/yast2-product-creator-2.21.11/Makefile.in 2011-09-27
14:56:08.000000000 +0200
@@ -261,7 +261,6 @@
# do we do Makefile.am for devtools? It is a little special...
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
DEVTOOLS_DIR = $(if
$(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
-ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if
$(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
COPYRIGHT_files_gpl = README COPYING
COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \
@@ -902,7 +901,7 @@
$(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain
package-local
+package: check-up-to-date check-tagversion check-textdomain package-local
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -930,21 +929,6 @@
check-parse:
@echo "Not running parseycp."
-check-all-packages:
- @if [ ! -e "$(ALL_PACKAGES)" ]; then \
- echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \
- fi
- @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then
\
- echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \
- fi
- @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \
- echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some
unknown (?) fields:"; \
- echo; \
- grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \
- echo; \
- false; \
- fi
-
check-textdomain:
$(Y2TOOL) check-textdomain $(srcdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-2.21.9/VERSION
new/yast2-product-creator-2.21.11/VERSION
--- old/yast2-product-creator-2.21.9/VERSION 2011-09-19 14:58:40.000000000
+0200
+++ new/yast2-product-creator-2.21.11/VERSION 2011-09-27 15:00:33.000000000
+0200
@@ -1 +1 @@
-2.21.9
+2.21.11
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-2.21.9/configure
new/yast2-product-creator-2.21.11/configure
--- old/yast2-product-creator-2.21.9/configure 2011-09-15 21:21:15.000000000
+0200
+++ new/yast2-product-creator-2.21.11/configure 2011-09-27 14:56:07.000000000
+0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for yast2-product-creator 2.21.8.
+# Generated by GNU Autoconf 2.68 for yast2-product-creator 2.21.10.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-product-creator'
PACKAGE_TARNAME='yast2-product-creator'
-PACKAGE_VERSION='2.21.8'
-PACKAGE_STRING='yast2-product-creator 2.21.8'
+PACKAGE_VERSION='2.21.10'
+PACKAGE_STRING='yast2-product-creator 2.21.10'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1229,7 +1229,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.21.8 to adapt to many kinds of
systems.
+\`configure' configures yast2-product-creator 2.21.10 to adapt to many kinds
of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1301,7 +1301,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-product-creator
2.21.8:";;
+ short | recursive ) echo "Configuration of yast2-product-creator
2.21.10:";;
esac
cat <<\_ACEOF
@@ -1381,7 +1381,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-product-creator configure 2.21.8
+yast2-product-creator configure 2.21.10
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1398,7 +1398,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.21.8, which was
+It was created by yast2-product-creator $as_me 2.21.10, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2328,7 +2328,7 @@
# Define the identity of the package.
PACKAGE='yast2-product-creator'
- VERSION='2.21.8'
+ VERSION='2.21.10'
cat >>confdefs.h <<_ACEOF
@@ -2450,7 +2450,7 @@
-VERSION="2.21.8"
+VERSION="2.21.10"
RPMNAME="yast2-product-creator"
MAINTAINER="Jiri Suchomel <[email protected]>"
@@ -3380,7 +3380,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.21.8, which was
+This file was extended by yast2-product-creator $as_me 2.21.10, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3433,7 +3433,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-product-creator config.status 2.21.8
+yast2-product-creator config.status 2.21.10
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-2.21.9/configure.in
new/yast2-product-creator-2.21.11/configure.in
--- old/yast2-product-creator-2.21.9/configure.in 2011-09-15
21:21:12.000000000 +0200
+++ new/yast2-product-creator-2.21.11/configure.in 2011-09-27
14:56:05.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-product-creator
dnl
-dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.21.2 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-product-creator, 2.21.8, http://bugs.opensuse.org/,
yast2-product-creator)
+AC_INIT(yast2-product-creator, 2.21.10, http://bugs.opensuse.org/,
yast2-product-creator)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.21.8"
+VERSION="2.21.10"
RPMNAME="yast2-product-creator"
MAINTAINER="Jiri Suchomel <[email protected]>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-2.21.9/src/ProductCreator.ycp
new/yast2-product-creator-2.21.11/src/ProductCreator.ycp
--- old/yast2-product-creator-2.21.9/src/ProductCreator.ycp 2011-08-19
09:49:17.000000000 +0200
+++ new/yast2-product-creator-2.21.11/src/ProductCreator.ycp 2011-09-27
14:55:10.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Data for configuration of product-creator, input and output
functions.
* Authors: Anas Nashif <[email protected]>
*
- * $Id: ProductCreator.ycp 60238 2010-01-06 13:18:38Z jsuchome $
+ * $Id: ProductCreator.ycp 65963 2011-09-23 10:12:26Z lslezak $
*
* Representation of the configuration of product-creator.
* Input and output routines.
@@ -327,11 +327,7 @@
}
else
{
- boolean pkgret = Pkg::SetSelection(
ProductCreator::Config["base"]:"" );
-
- foreach(string addon, ProductCreator::Config["addons"]:[], ``{
- Pkg::SetSelection( addon );
- });
+ y2warning("Unsupported software selection type: %1",
ProductCreator::Config["type"]:`unknown);
}
if (size(ProductCreator::Config["packages"]:[] ) > 0)
@@ -2738,19 +2734,7 @@
}
else
{
- // Base Selection
- if (base!="")
- {
- Pkg::SetSelection(base);
- }
-
- // Addons
- if (size(addons) > 0 )
- {
- foreach(string s, addons, ``{
- Pkg::SetSelection(s);
- });
- }
+ y2warning("Unsupported software selection type: %1",
ProductCreator::Config["type"]:`unknown);
}
packages = (list<string>) union(packages, post_packages);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-2.21.9/src/dialogs.ycp
new/yast2-product-creator-2.21.11/src/dialogs.ycp
--- old/yast2-product-creator-2.21.9/src/dialogs.ycp 2011-09-15
17:20:30.000000000 +0200
+++ new/yast2-product-creator-2.21.11/src/dialogs.ycp 2011-09-27
15:01:15.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Anas Nashif <[email protected]>
*
- * $Id: dialogs.ycp 64839 2011-07-15 10:18:50Z jsuchome $
+ * $Id: dialogs.ycp 66097 2011-09-27 13:01:14Z visnov $
*/
{
@@ -1131,11 +1131,7 @@
}
else
{
- boolean pkgret = Pkg::SetSelection(
ProductCreator::Config["base"]:"" );
-
- foreach(string addon, ProductCreator::Config["addons"]:[], ``{
- Pkg::SetSelection( addon );
- });
+ y2warning("Unsupported software selection type: %1",
ProductCreator::Config["type"]:`unknown);
}
if (size(ProductCreator::Config["packages"]:[] ) > 0)
@@ -1307,7 +1303,7 @@
Wizard::CreateDialog();
- Wizard::SetDesktopIcon("product-creator");
+ Wizard::SetDesktopTitleAndIcon("product-creator");
string base_selection = "";
@@ -1315,205 +1311,56 @@
`HVCenter(`Label(_("Reading package database..."))),
helptext, false, true);
- list<string> available_base_selections = Pkg::GetSelections(
`available, "base" );
- y2milestone ("available_base_selections %1",
available_base_selections);
-
- list<string> current_base_selections = Pkg::GetSelections( `selected,
"base" );
- y2milestone ("current_base_selections %1", current_base_selections);
+ list<string> addons = patterns;
- boolean using_patterns = false;
+ // ensure that a langugage is selected
+ ProductCreator::CheckLanguage();
- // use patterns instead of selections
- if (size(available_base_selections) == 0)
+ if (size(addons) > 0 || ProductCreator::Config["base"]:"" != "")
{
- y2milestone("No selections, using patterns");
- using_patterns = true;
-
- list<string> addons = patterns;
-
- // ensure that a langugage is selected
- ProductCreator::CheckLanguage();
+ y2milestone("base pattern: %1, addons: %2", base_pattern, addons);
- if (size(addons) > 0 || ProductCreator::Config["base"]:"" != "")
+ // select the base pattern
+ if (base_pattern != "")
{
- y2milestone("base pattern: %1, addons: %2", base_pattern,
addons);
-
- // select the base pattern
- if (base_pattern != "")
- {
- Pkg::ResolvableInstall(base_pattern, `pattern);
- }
+ Pkg::ResolvableInstall(base_pattern, `pattern);
+ }
- // select the addons
- foreach(string addon, addons,
- {
- Pkg::ResolvableInstall(addon, `pattern);
- });
+ // select the addons
+ foreach(string addon, addons,
+ {
+ Pkg::ResolvableInstall(addon, `pattern);
+ });
- // mark taboo packages
- ProductCreator::MarkTaboo(taboo);
+ // mark taboo packages
+ ProductCreator::MarkTaboo(taboo);
- Pkg::PkgSolve(true);
+ Pkg::PkgSolve(true);
- }
+ }
- // add extra packages
- if (size(packages) > 0)
+ // add extra packages
+ if (size(packages) > 0)
+ {
+ foreach(string p, packages,
{
- foreach(string p, packages,
- {
- InstallPackageOrProvider (p);
- });
- }
+ InstallPackageOrProvider (p);
+ });
+ }
- y2milestone("package selection mode: %1", mode);
+ y2milestone("package selection mode: %1", mode);
- if (mode == `packages)
- {
- ret = detailedSelection(nil);
- }
- else if (mode == `patterns)
- {
- ret = patternSelection();
- }
- else
- {
- y2error("Unknown mode parameter: %1", mode);
- }
+ if (mode == `packages)
+ {
+ ret = detailedSelection(nil);
+ }
+ else if (mode == `patterns)
+ {
+ ret = patternSelection();
}
else
{
- // save the current base selection
- string save_selection = current_base_selections[0]:"default";
-
- // Construct a box with radiobuttons for each software base
configuration
- term baseconfs_box = `VBox();
-
- // sort available_base_selections by order
- // $[ "order" : [ "name", "summary" ], .... ]
-
- map<string, list> sorted_base_selections = $[];
- foreach( string selection, available_base_selections,
- ``{
- map selection_data = Pkg::SelectionData (selection);
- if (selection_data != nil)
- {
- string order = selection_data["order"]:"";
- // use selection name as sort criteria if not given
- if (order == "")
- {
- order = selection;
- }
- sorted_base_selections[order] = [selection,
selection_data["summary"]:("'"+selection+"'")];
- }
- });
- // construct display box in order
- boolean selected = false;
- foreach(string order, list data, sorted_base_selections,
- ``{
- {
- if (base_pattern == "" && !selected)
- {
- base_pattern = data[0]:"";
- selected = true;
- }
- baseconfs_box = add( baseconfs_box,
`Left(`RadioButton(`id(data[0]:""), // id
- `opt(`notify, `autoShortcut),
- data[1]:"", // descrption
- (data[0]:"" == base_pattern) )));
- }
- });
-
- term contents = `HVSquash(
- `VBox(
- `HSquash(
- `VBox(
- `Frame(
- // Frame caption for software selection
- _("Software"),
- `VBox(
- `VSpacing(0.3),
-
`RadioButtonGroup(`id(`baseconf),`opt(`notify), baseconfs_box),
- `VSpacing(0.3)
- )
- ),
- `VSpacing(),
-
- // Push button that will pop up the detailed
- // software selection (e.g. Multimedia, Games,
- // KDE, Gnome, ... - not the individual
packages!)
- `PushButton( `id(`details), _("&Detailed
selection...") )
- )
- )
- )
- );
-
- Wizard::SetContentsButtons(caption, contents, helptext,
- Label::BackButton(), Label::NextButton());
-
-
-
- boolean selret = false;
- repeat
- {
- ret = Wizard::UserInput();
-
- // get the newly selected base configuration
- base_selection = (string) UI::QueryWidget(
`id(`baseconf),`CurrentButton );
-
- // Inform the package manager on `next about the new (only
about a NEW) selection
- // or if the selection has changed
-
- if (ret == `next)
- {
- // set the new selection
- boolean pkgret = Pkg::SetSelection( base_selection );
- y2milestone("base selection: %1", pkgret);
- if (size(packages) > 0)
- {
- foreach(string p, packages, ``{
- y2debug("selecting package for installation: %1
-> %2", p, Pkg::PkgInstall(p));
- });
- }
-
- // mark taboo packages
- ProductCreator::MarkTaboo(taboo);
- }
- else if ( ret == `abort)
- {
- if(ProductCreator::ReallyAbort()) break;
- else continue;
- }
- else if ( ret == `details )
- {
- ret = `again;
-
- Pkg::SetSelection( base_selection );
-
- foreach(string addon, patterns, ``{
- Pkg::SetSelection( addon );
- });
-
- // mark taboo packages
- ProductCreator::MarkTaboo(taboo);
-
- Pkg::PkgSolve(true);
- if (size(packages) > 0)
- {
- foreach(string p, packages, ``{
- y2milestone("selecting package for
installation: %1 -> %2", p, Pkg::PkgInstall(p));
- });
- }
-
- while ( ret == `again )
- {
- ret = PackagesUI::RunPackageSelector($["mode" :
`searchMode]);
-
- if ( ret == `accept )
- ret = `next;
- }
- }
- } until ( ret == `next || ret == `back);
+ y2error("Unknown mode parameter: %1", mode);
}
y2milestone("Selected packages: %1 ", size(Pkg::GetPackages(`selected,
true)));
@@ -1540,27 +1387,24 @@
list selbase = [];
if ( ret != `back && ret != `cancel)
{
- if (!using_patterns)
- {
- seladd = Pkg::GetSelections(`selected, "");
- selbase = Pkg::GetSelections(`selected, "base");
- }
- else
+ // do not return patterns selected by dependencies
+ foreach (map pat, Pkg::ResolvableProperties ("", `pattern, ""),
{
- // do not return patterns selected by dependencies
- foreach (map pat, Pkg::ResolvableProperties ("", `pattern, ""),
+ y2debug("Processing pattern: %1", pat);
+ if (pat["status"]:`none == `selected)
{
- y2debug("Processing pattern: %1", pat);
- if (pat["status"]:`none == `selected)
+ string pat_name = pat["name"]:"";
+ y2milestone ("pat %1 selected by %2" , pat_name,
pat["transact_by"]:nil);
+
+ if (pat["transact_by"]:nil != `solver)
+ seladd = add (seladd, pat_name);
+
+ if (pat["category"]:"" == "base")
{
- y2milestone ("pat %1 selected by %2" , pat["name"]:"",
- pat["transact_by"]:nil);
- if (pat["transact_by"]:nil != `solver)
- seladd = add (seladd, pat["name"]:"");
+ selbase = add(selbase, pat_name);
}
- });
- selbase = Pkg::GetPatterns(`selected, "base");
- }
+ }
+ });
}
else
{
@@ -1591,8 +1435,8 @@
ret_map["taboo"] = Pkg::GetPackages(`taboo, true);
y2milestone("taboo packages: %1", ret_map["taboo"]:[]);
- // selections or patterns are used in the product
- ret_map["type"] = using_patterns ? `patterns : `selections;
+ // patterns are used in the product
+ ret_map["type"] = `patterns;
ret_map["ui"] = ret;
@@ -1757,7 +1601,7 @@
import "Summary";
Wizard::CreateDialog();
- Wizard::SetDesktopIcon("product-creator");
+ Wizard::SetDesktopTitleAndIcon("product-creator");
string caption = _("Configuration Summary");
Wizard::SetContents( caption,
`Empty(),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-2.21.9/src/image-creator.ycp
new/yast2-product-creator-2.21.11/src/image-creator.ycp
--- old/yast2-product-creator-2.21.9/src/image-creator.ycp 2011-09-19
09:22:31.000000000 +0200
+++ new/yast2-product-creator-2.21.11/src/image-creator.ycp 2011-09-27
15:01:15.000000000 +0200
@@ -1,5 +1,5 @@
/**
- * $Id: image-creator.ycp 65770 2011-09-19 07:22:30Z visnov $
+ * $Id: image-creator.ycp 66097 2011-09-27 13:01:14Z visnov $
*
*/
@@ -23,7 +23,7 @@
define boolean ICSequence() {
Wizard::CreateDialog();
- Wizard::SetDesktopIcon("product-creator");
+ Wizard::SetDesktopTitleAndIcon("product-creator");
if (!Confirm::MustBeRoot ())
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-2.21.9/src/kiwi.ycp
new/yast2-product-creator-2.21.11/src/kiwi.ycp
--- old/yast2-product-creator-2.21.9/src/kiwi.ycp 2011-08-19
09:49:17.000000000 +0200
+++ new/yast2-product-creator-2.21.11/src/kiwi.ycp 2011-09-27
15:01:15.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Client to start the kiwi UI
* Authors: Jiri Suchomel <[email protected]>
*
- * $Id: kiwi.ycp 56775 2009-04-14 13:47:55Z jsuchome $
+ * $Id: kiwi.ycp 66097 2011-09-27 13:01:14Z visnov $
*
*/
@@ -43,7 +43,7 @@
];
Wizard::CreateDialog();
- Wizard::SetDesktopIcon("kiwi");
+ Wizard::SetDesktopTitleAndIcon("kiwi");
if (!Confirm::MustBeRoot ())
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-product-creator-2.21.9/src/wizards.ycp
new/yast2-product-creator-2.21.11/src/wizards.ycp
--- old/yast2-product-creator-2.21.9/src/wizards.ycp 2011-08-19
09:49:17.000000000 +0200
+++ new/yast2-product-creator-2.21.11/src/wizards.ycp 2011-09-27
15:01:15.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Wizards definitions
* Authors: Anas Nashif <[email protected]>
*
- * $Id: wizards.ycp 58530 2009-09-04 13:23:24Z jsuchome $
+ * $Id: wizards.ycp 66097 2011-09-27 13:01:14Z visnov $
*/
{
@@ -303,7 +303,7 @@
];
Wizard::CreateDialog();
- Wizard::SetDesktopIcon("product-creator");
+ Wizard::SetDesktopTitleAndIcon("product-creator");
list<string> required_packages = ["inst-source-utils", "mkisofs",
"createrepo"];
// add PPC specific packages
continue with "q"...
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
