Hello community,
here is the log from the commit of package yast2-packager
checked in at Thu Jan 31 12:17:22 CET 2008.
--------
--- yast2-packager/yast2-packager.changes 2008-01-27 20:58:51.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2008-01-31 11:19:29.000000000 +0100
@@ -1,0 +2,14 @@
+Thu Jan 31 11:17:06 CET 2008 - locilka@suse.cz
+
+- Reworked ProductLicense module to handle first-stage installation
+ license.
+- 2.16.18
+
+-------------------------------------------------------------------
+Tue Jan 29 20:14:27 CET 2008 - locilka@suse.cz
+
+- Unified DefaultDesktop module and software/desktop selection
+ dialog in installation.
+- 2.16.17
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.16.16.tar.bz2
New:
----
yast2-packager-2.16.18.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.Z13442/_old 2008-01-31 12:16:31.000000000 +0100
+++ /var/tmp/diff_new_pack.Z13442/_new 2008-01-31 12:16:31.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.16.16)
+# spec file for package yast2-packager (Version 2.16.18)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-packager
-Version: 2.16.16
-Release: 4
+Version: 2.16.18
+Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.16.16.tar.bz2
+Source0: yast2-packager-2.16.18.tar.bz2
Prefix: /usr
BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer update-desktop-files yast2-country-data yast2-devtools yast2-slp yast2-testsuite yast2-xml
# Progress::Subprogress*()
@@ -65,7 +65,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.16.16
+%setup -n yast2-packager-2.16.18
%build
%{prefix}/bin/y2tool y2autoconf
@@ -102,6 +102,14 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog
+* Thu Jan 31 2008 locilka@suse.cz
+- Reworked ProductLicense module to handle first-stage installation
+ license.
+- 2.16.18
+* Tue Jan 29 2008 locilka@suse.cz
+- Unified DefaultDesktop module and software/desktop selection
+ dialog in installation.
+- 2.16.17
* Sun Jan 27 2008 coolo@suse.de
- fixing changelog order
* Fri Jan 25 2008 lslezak@suse.cz
@@ -1232,7 +1240,7 @@
the [Details...] button possible. Leaving the old ones unchanged.
- splitting displayed fingerprint with space after every 4th
character
-* Fri Apr 21 2006 jsrain@suse.de
+* Sat Apr 22 2006 jsrain@suse.de
- create 1st source as source containing base product (#160585)
- 2.13.93
* Thu Apr 20 2006 mvidner@suse.cz
@@ -1266,7 +1274,7 @@
- DirInstall - don't initialize the sources in the constructor,
install the package callbacks in the dirinstall mode (#167281)
- 2.13.85
-* Fri Apr 14 2006 jsrain@suse.de
+* Sat Apr 15 2006 jsrain@suse.de
- reverted displaying selected patterns in simple proposal (#162281)
- 2.13.84
* Fri Apr 14 2006 mvidner@suse.cz
@@ -1432,7 +1440,7 @@
* Mon Mar 20 2006 locilka@suse.cz
- proper handling with data returned from Pkg::TargetGetDU()
boolean -> integer (#159463)
-* Thu Mar 16 2006 jsrain@suse.de
+* Fri Mar 17 2006 jsrain@suse.de
- provide function to initialize installation sources with
visual feedback
- 2.13.47
@@ -1452,7 +1460,7 @@
* Tue Mar 14 2006 visnov@suse.cz
- disable sources on the target system for upgrade (#154850)
- 2.13.44
-* Mon Mar 13 2006 jsrain@suse.de
+* Tue Mar 14 2006 jsrain@suse.de
- do not report void error during installation after reboot
- fixed encodign the URL options (#155428)
- 2.13.43
@@ -1505,7 +1513,7 @@
* Fri Feb 24 2006 jsuchome@suse.cz
- added dialogs for ISO installation source
- 2.13.34
-* Thu Feb 23 2006 jsrain@suse.de
+* Fri Feb 24 2006 jsrain@suse.de
- add support for patterns to proposal routines
- 2.13.33
* Wed Feb 22 2006 jsrain@suse.de
@@ -2604,7 +2612,7 @@
- InstURL: default directory to "/"
- PackageCallbacks: remove bogus loop
- 2.6.32
-* Sun Sep 08 2002 kkaempf@suse.de
+* Mon Sep 09 2002 kkaempf@suse.de
- pass correct locale to packagemanager
- filter /etc/install.inf entries, linuxrc bug workaround
- 2.6.31
@@ -2653,7 +2661,7 @@
* Thu Aug 29 2002 kkaempf@suse.de
- Add directory to Url if not given by linuxrc
- 2.6.18
-* Wed Aug 28 2002 kkaempf@suse.de
+* Thu Aug 29 2002 kkaempf@suse.de
- drop InstMedia, it's all in packagemanager now
- 2.6.17
* Tue Aug 27 2002 kkaempf@suse.de
++++++ yast2-packager-2.16.16.tar.bz2 -> yast2-packager-2.16.18.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.16/configure new/yast2-packager-2.16.18/configure
--- old/yast2-packager-2.16.16/configure 2008-01-22 15:31:23.000000000 +0100
+++ new/yast2-packager-2.16.18/configure 2008-01-18 13:29:47.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-packager 2.16.16.
+# Generated by GNU Autoconf 2.61 for yast2-packager 2.16.15.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.16.16'
-PACKAGE_STRING='yast2-packager 2.16.16'
+PACKAGE_VERSION='2.16.15'
+PACKAGE_STRING='yast2-packager 2.16.15'
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-packager 2.16.16 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.16.15 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-packager 2.16.16:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.16.15:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.16.16
+yast2-packager configure 2.16.15
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-packager $as_me 2.16.16, which was
+It was created by yast2-packager $as_me 2.16.15, 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-packager'
- VERSION='2.16.16'
+ VERSION='2.16.15'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.16.16"
+VERSION="2.16.15"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
@@ -3304,7 +3304,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-packager $as_me 2.16.16, which was
+This file was extended by yast2-packager $as_me 2.16.15, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-packager config.status 2.16.16
+yast2-packager config.status 2.16.15
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-packager-2.16.16/configure.in new/yast2-packager-2.16.18/configure.in
--- old/yast2-packager-2.16.16/configure.in 2008-01-22 15:31:19.000000000 +0100
+++ new/yast2-packager-2.16.18/configure.in 2008-01-18 13:29:35.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.3 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.16.16, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.16.15, http://bugs.opensuse.org/, yast2-packager)
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.16.16"
+VERSION="2.16.15"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.16/Makefile.in new/yast2-packager-2.16.18/Makefile.in
--- old/yast2-packager-2.16.16/Makefile.in 2008-01-22 15:31:25.000000000 +0100
+++ new/yast2-packager-2.16.18/Makefile.in 2008-01-18 13:29:49.000000000 +0100
@@ -505,6 +505,10 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -531,6 +535,8 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -687,10 +693,10 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
- dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-generic distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am \
+ dist-hook dist-lzma dist-shar dist-tarZ dist-zip distcheck \
+ distclean distclean-generic distclean-tags distcleancheck \
+ distdir distuninstallcheck dvi dvi-am html html-am info \
+ info-am install install-am install-data install-data-am \
install-data-local install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
install-info-am install-man install-pdf install-pdf-am \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.16/packager.pot new/yast2-packager-2.16.18/packager.pot
--- old/yast2-packager-2.16.16/packager.pot 2007-12-10 14:45:09.000000000 +0100
+++ new/yast2-packager-2.16.18/packager.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,218 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-10 13:33+0200\n"
-"PO-Revision-Date: 2007-08-22 10:20+0200\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. explanation text for KDE
-#: src/clients/inst_desktop.ycp:62
-msgid ""
-"KDE is a powerful and intuitive desktop\n"
-"environment that uses Kontact as its mailer,\n"
-"Konqueror as its file manager, and offers\n"
-"both Firefox and Konqueror as its Web browser."
-msgstr ""
-"KDE is a powerful and intuitive desktop\n"
-"environment that uses Kontact as its mailer,\n"
-"Konqueror as its file manager, and offers\n"
-"both, Firefox and Konqueror as its Web browser."
-
-#. TRANSLATORS: popup header
-#: src/clients/inst_productsources.ycp:124
-msgid "Network is not Configured"
-msgstr "Network is not configured"
-
-#. TRANSLATORS: dialog help
-#: src/clients/inst_productsources.ycp:426
-msgid ""
-"<p>Please wait, while packager is being initialized\n"
-"and list of servers dowloaded from web.</p>"
-msgstr ""
-"<p>Please wait, while packager is being initialized\n"
-"and a list of servers dowloaded from web.</p>"
-
-#. TRANSLATORS: dialog help 1/3
-#: src/clients/inst_productsources.ycp:877
-msgid ""
-"<p>Here you can see default online repositories downloaded from Internet.\n"
-"Click on the repository to see its details.</p>"
-msgstr ""
-"<p>Here you can see default online repositories downloaded from the Internet.\n"
-"Click on the repository to see its details.</p>"
-
-#. help, continued
-#: src/clients/inst_source.ycp:545
-msgid ""
-"<p>\n"
-"The CDs can be copied to the <b>hard disk</b>\n"
-"Then use that as the repository.\n"
-"Insert the path name where the first\n"
-"CD is located, for example, /data1/<b>CD1</b>.\n"
-"Only the base path is required if all CDs are copied\n"
-"into one directory.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"The CDs can be copied to the <b>hard disk</b>\n"
-"Then use it as the repository.\n"
-"Insert the path name where the first\n"
-"CD is located, for example, /data1/<b>CD1</b>.\n"
-"Only the base path is required if all CDs are copied\n"
-"into one directory.\n"
-"</p>\n"
-
-#. help, continued
-#: src/clients/inst_source.ycp:567
-msgid ""
-"<p>\n"
-"<b>Synchronize Changes with ZENworks</b> will call <tt>rug</tt>\n"
-"to perform the changes also in that package management system.</p>"
-msgstr ""
-"<p>\n"
-"<b>Synchronize changes with ZENworks</b> will call <tt>rug</tt>\n"
-"to perform the changes also in that package management system.</p>"
-
-#. popup message part 1
-#: src/clients/inst_source.ycp:621
-msgid ""
-"Unable to save changes to repository\n"
-"configuration."
-msgstr ""
-"Unable to save changes to the repository\n"
-"configuration."
-
-#. Command line help text for the repository module, %1 is "zypper"
-#: src/clients/inst_source.ycp:974
-msgid "Installation Repositories - this module doesn't support command line interface, use '%1' instead."
-msgstr "Installation Repositories - this module does not support the command line interface, use '%1' instead."
-
-#: src/clients/sw_single.ycp:190
-msgid "There was an error in repository initialization."
-msgstr "There was an error in the repository initialization."
-
-#. Command line help text for the software management module, %1 is "zypper"
-#: src/clients/sw_single.ycp:473
-msgid "Software installation - this module doesn't support command line interface, use '%1' instead."
-msgstr "Software installation - this module does not support the command line interface, use '%1' instead."
-
-#: src/modules/Packages.ycp:864
-msgid "Failed to integrate service pack repository."
-msgstr "Failed to integrate the service pack repository."
-
-#. help text
-#: src/modules/SourceDialogs.ycp:252
-msgid ""
-"<p><big><b>Repository Name</b></big><br>\n"
-"Use <b>Repository Name</b> to specify the name of the repository. If it is empty Yast will use the product name (if available) or the URL as the name.</p>"
-msgstr ""
-"<p><big><b>Repository Name</b></big><br>\n"
-"Use <b>Repository Name</b> to specify the name of the repository. If it is empty YaST will use the product name (if available) or the URL as the name.</p>"
-
-#. error popup - the entered path is not a directory
-#: src/modules/SourceDialogs.ycp:587
-msgid ""
-"The entered path is not a directory\n"
-"or the directory doesn't exist."
-msgstr ""
-"The entered path is not a directory\n"
-"or the directory does not exist."
-
-#. error popup - the entered path is not a regular file
-#: src/modules/SourceDialogs.ycp:614
-msgid ""
-"The entered path is not a file\n"
-"or the file doesn't exist."
-msgstr ""
-"The entered path is not a file\n"
-"or the file does not exist."
-
-#. continue/cancel popup, %1 is a file name
-#: src/modules/SourceDialogs.ycp:637
-msgid ""
-"File '%1'\n"
-"doesn't seem to be an ISO image.\n"
-"Use it anyway?"
-msgstr ""
-"File '%1'\n"
-"does not seem to be an ISO image.\n"
-"Use it anyway?"
-
-#. help text - server dialog
-#: src/modules/SourceDialogs.ycp:1039
-msgid ""
-"<p><big><b>Server and Directory</b></big><br>\n"
-"Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>\n"
-"to specify the NFS server host name and path on the server.\n"
-"To enable authentication, uncheck <b>Anonymous</b> and specify the\n"
-"<b>User Name</b> and the <b>Password</b>.</p>\n"
-"<p>\n"
-"For SMB/CIFS repository, specify <b>Share</b> name and <b>Path to Directory\n"
-"or ISO Image</b>. \n"
-"If the location is a file holding an ISO image\n"
-"of the media, set <b>ISO Image</b>.</p>"
-msgstr ""
-"<p><big><b>Server and Directory</b></big><br>\n"
-"Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>\n"
-"to specify the NFS server host name and path on the server.\n"
-"To enable authentication, uncheck <b>Anonymous</b> and specify the\n"
-"<b>User Name</b> and the <b>Password</b>.</p>\n"
-"<p>\n"
-"For the SMB/CIFS repository, specify <b>Share</b> name and <b>Path to Directory\n"
-"or ISO Image</b>. \n"
-"If the location is a file holding an ISO image\n"
-"of the media, set <b>ISO Image</b>.</p>"
-
-#. help text - server dialog, there is a "Port" widget
-#: src/modules/SourceDialogs.ycp:1050
-msgid ""
-"<p>It's possible to set the <b>Port</b> number for a HTTP/HTTPS repository.\n"
-"Leave it empty to use the default port.</p>"
-msgstr ""
-"<p>It is possible to set the <b>Port</b> number for a HTTP/HTTPS repository.\n"
-"Leave it empty to use the default port.</p>"
-
-#: src/modules/SourceDialogs.ycp:1305
-msgid ""
-"<p><b>Download Files</b><br>\n"
-"Each repository has description files which describe content of the repository.\n"
-"Check option <b>Download repository description files</b> to download the files\n"
-"when closing this Yast module. If the option is unchecked Yast will\n"
-"automatically download the files when it needs them later. </p>"
-msgstr ""
-"<p><b>Download Files</b><br>\n"
-"Each repository has description files which describe the content of the repository.\n"
-"Check the<b>Download repository description files</b> option to download the files\n"
-"when closing this YaST module. If the option is unchecked YaST will\n"
-"automatically download the files when it needs them later. </p>"
-
-#. popup message header
-#: src/modules/SourceManager.ycp:240
-msgid ""
-"Unable to save changes to the repository\n"
-" repository.\n"
-msgstr "Unable to save changes to the repository.\n"
-
-#. message popup
-#: src/modules/SourceManagerSLP.ycp:314
-msgid ""
-"Please, select one of offered options.\n"
-"This product has more repositories available."
-msgstr ""
-"Please select one of offered options.\n"
-"This product has more repositories available."
-
-#. error popup
-#: src/modules/SourceManagerSLP.ycp:508
-msgid "No SLP repositories have been found on your network."
-msgstr "No SLP repositories have been found on your network."
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.16/src/modules/DefaultDesktop.ycp new/yast2-packager-2.16.18/src/modules/DefaultDesktop.ycp
--- old/yast2-packager-2.16.16/src/modules/DefaultDesktop.ycp 2007-07-19 10:02:37.000000000 +0200
+++ new/yast2-packager-2.16.18/src/modules/DefaultDesktop.ycp 2008-01-29 17:48:55.000000000 +0100
@@ -14,6 +14,66 @@
import "ProductFeatures";
+
+// Could be defined in control file
+// @see GetAllDesktopsMap
+map all_desktops = $[
+ "gnome" : $[
+ "order" : 1,
+ // TRANSLATORS: Dialog label
+ "label" : _("GNOME Desktop"),
+ "patterns" : ["gnome", "x11", "base"],
+ "icon" : "pattern-gnome",
+ ],
+ "kde" : $[
+ "order" : 1,
+ // TRANSLATORS: Dialog label
+ "label" : _("KDE Desktop"),
+ "patterns" : ["kde", "x11", "base"],
+ "icon" : "pattern-kde",
+ ],
+ "xfce" : $[
+ "order" : 4,
+ // TRANSLATORS: Dialog label
+ "label" : _("XFCE Desktop"),
+ "patterns" : ["xfce", "x11", "base"],
+ "icon" : "yast-tv",
+ ],
+ "min_x" : $[
+ "order" : 6,
+ // TRANSLATORS: Dialog label
+ "label" : _("Minimal X-Windows"),
+ "patterns" : ["x11", "base"],
+ "icon" : "yast-x11",
+ ],
+ "textmode" : $[
+ "order" : 8,
+ // TRANSLATORS: Dialog label
+ "label" : _("Minimal Server Selection (Text Mode)"),
+ "patterns" : ["base"],
+ "icon" : "yast-sshd",
+ ],
+];
+
+/**
+ * Returns map of pre-defined default system tasks
+ *
+ * @return map all_system_tasks
+ *
+ * @struct $[
+ * "desktop ID" : $[
+ * "order" : integer,
+ * "label" : _("Desktop Name Visible in Dialog"),
+ * "description" : _("Description text of the desktop"),
+ * "patterns" : ["list", "of", "related", "patterns"],
+ * "icon" : "some-icon", // filename from the 32x32 directory of the current theme (without .png suffix)
+ * ],
+ * ]
+ */
+global map GetAllDesktopsMap () {
+ return all_desktops;
+}
+
/**
* Desktop which was selected in the desktop selection dialog
* "kde", "gnome", "min_x11", "text"
@@ -31,37 +91,6 @@
];
/**
- * Patterns to be preselected according to selected desktop
- */
-map patterns_to_select = $[
- "gnome" : [ "gnome", "x11", "base" ],
- "kde" : [ "kde", "x11", "base" ],
- "min_x11" : [ "x11", "base" ],
- "text" : [ "base" ],
-];
-
-/**
- * Patterns NOT to be preselected according to selected desktop
- */
-map patterns_to_deselect = $[
- "gnome" : [ "kde" ],
- "kde" : [ "gnome" ],
- "min_x11" : [ "kde, gnome" ],
- "text" : [ "kde, gnome", "x11" ],
-];
-
-/**
- * Map of desktop descriptions
- */
-map desktop_descr = $[
- "kde" : _("KDE"),
- "gnome" : _("GNOME"),
- "min_x11" : _("Minimal Graphical System"),
- "text" : _("Text Mode"),
-];
-
-
-/**
* Get the currently set default desktop, nil if none set
* @return string "kde", "gnome", "min_x11", "text", nil
*/
@@ -74,7 +103,7 @@
* @param desktop a string, one of "kde", "gnome", "min_x11", "text" or nil
*/
global void SetDesktop (string new_desktop) {
- if (new_desktop != nil && ! haskey (desktop2wm, new_desktop))
+ if (new_desktop != nil && ! haskey (all_desktops, new_desktop))
y2error ("Attempting to set desktop to unknown %1", new_desktop);
else
desktop = new_desktop;
@@ -93,7 +122,7 @@
* @return a list of patterns
*/
global list<string> PatternsToSelect () {
- return patterns_to_select[desktop]:[];
+ return all_desktops[desktop, "patterns"]:[];
}
/**
@@ -101,7 +130,25 @@
* @return a list of patterns
*/
global list<string> PatternsToDeselect () {
- return patterns_to_deselect[desktop]:[];
+ // patterns which must be selected
+ list <string> patterns_to_select = PatternsToSelect();
+
+ list <string> patterns_to_deselect = [];
+
+ // go through all known system task definitions
+ foreach (string one_desktop, map desktop_descr, all_desktops, {
+ // all patterns required by a system type
+ foreach (string one_pattern, desktop_descr["patterns"]:[], {
+ // if not required, add it to 'to deselect'
+ if (one_pattern != nil && ! contains (patterns_to_select, one_pattern)) {
+ patterns_to_deselect = add (patterns_to_deselect, one_pattern);
+ }
+ });
+ });
+
+ y2milestone ("Patterns to deselect '%1' -> %2", desktop, patterns_to_deselect);
+
+ return patterns_to_deselect;
}
/**
@@ -109,7 +156,8 @@
* @return string the description of the desktop
*/
global string Description () {
- return desktop_descr[desktop]:"";
+ // TRANSLATORS: dialog label
+ return all_desktops[desktop, "label"]:_("No system type selected");
}
/**
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.16/src/modules/Packages.ycp new/yast2-packager-2.16.18/src/modules/Packages.ycp
--- old/yast2-packager-2.16.16/src/modules/Packages.ycp 2008-01-17 10:27:17.000000000 +0100
+++ new/yast2-packager-2.16.18/src/modules/Packages.ycp 2008-01-29 17:48:55.000000000 +0100
@@ -3,7 +3,7 @@
* Package: Package selections
* Authors: Anas Nashif
*
- * $Id: Packages.ycp 43664 2008-01-16 14:25:15Z locilka $
+ * $Id: Packages.ycp 43967 2008-01-29 13:17:41Z locilka $
*/
{
@@ -270,8 +270,8 @@
// (e.g. openSUSE 10.3, SUSE Linux Enterprise ...)
output = (list<string>)merge (output, ListSelected (`product, _("Product: %1")));
if (contains (flags, `desktop))
- // installation proposal - SW summary, %1 is name of the selected desktop (e.g. KDE)
- output = (list<string>)add (output, sformat(_("Desktop: %1"), DefaultDesktop::Description ()));
+ // installation proposal - SW summary, %1 is name of the selected desktop or system type (e.g. KDE)
+ output = (list<string>)add (output, sformat(_("System Type: %1"), DefaultDesktop::Description ()));
if (contains (flags, `pattern))
output = (list<string>)
merge (output, ListSelected (`pattern, "+ %1"));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.16/src/modules/ProductLicense.ycp new/yast2-packager-2.16.18/src/modules/ProductLicense.ycp
--- old/yast2-packager-2.16.16/src/modules/ProductLicense.ycp 2007-11-19 14:04:38.000000000 +0100
+++ new/yast2-packager-2.16.18/src/modules/ProductLicense.ycp 2008-01-30 16:53:56.000000000 +0100
@@ -96,7 +96,7 @@
return license_file;
}
-term GetLicenseContent (string lic_lang, map & licenses) {
+global term GetLicenseContent (string lic_lang, map & licenses) {
string license_file = WhichLicenceFile (lic_lang, licenses);
string license_text = (string) SCR::Read(.target.string, license_file);
@@ -117,19 +117,10 @@
// filename printed in the license dialog
string license_file_print = nil;
-/**
- * Displays License with Help and ( ) Yes / ( ) No radio buttons
- * @param string file with the license
- */
-void DisplayLicenseDialog (list<string> languages, boolean back, string license_language, map & licenses) {
+term GetLicenseDialogTerm (list<string> languages, string license_language, map & licenses) {
string license_text = "";
- map display = UI::GetDisplayInfo();
- integer space = display["TextMode"]:true ? 1 : 3;
term rt = GetLicenseContent (license_language, licenses);
- // dialog caption
- string caption = _("License Agreement");
-
// bug #204791, no more "languages.ycp" client
map lang_names_orig = Language::GetLanguagesMap (false);
if (lang_names_orig == nil) {
@@ -193,16 +184,37 @@
return `item (`id (descr[0]:""), descr[1]:"", (descr[0]:"" == license_language));
});
+ term lang_selector_options = `opt (`notify);
+ // Disable in case there is no language to select
+ // bugzilla #203543
+ if (size (langs) <= 1) {
+ lang_selector_options = add (lang_selector_options, `disabled);
+ }
+
+ return `VBox (
+ // combo box
+ `Left (`ComboBox (`id (`lang), lang_selector_options, _("&Language"),
+ langs)),
+ `ReplacePoint (`id (`license_rp), rt)
+ );
+}
+
+/**
+ * Displays License with Help and ( ) Yes / ( ) No radio buttons
+ * @param string file with the license
+ */
+void DisplayLicenseDialog (list<string> languages, boolean back, string license_language, map & licenses) {
+ map display = UI::GetDisplayInfo();
+ integer space = display["TextMode"]:true ? 1 : 3;
+
+ // dialog caption
+ string caption = _("License Agreement");
+
term contents = `VBox (
`VSpacing (1),
`HBox (
`HSpacing (2*space),
- `VBox (
- // combo box
- `Left (`ComboBox (`id (`lang), `opt (`notify), _("&Language"),
- langs)),
- `ReplacePoint (`id (`license_rp), rt)
- ),
+ GetLicenseDialogTerm (languages, license_language, licenses),
`HSpacing (2*space)
),
`VSpacing (2),
@@ -253,11 +265,7 @@
Wizard::SetContents(caption, contents, help,
back, false);
- // bugzilla #203543
- if (size(langs) <= 1) {
- UI::ChangeWidget (`id(`lang), `Enabled, false);
- }
-
+
Wizard::SetTitleIcon ("yast-license");
Wizard::SetFocusToNextButton();
}
@@ -534,28 +542,10 @@
y2milestone ("ProductLicense settings: license_dir: %1, tmpdir: %2, info_file: %3", license_dir, tmpdir, info_file);
}
-/**
- * Ask user to confirm license agreement
- * @param src_id integer repository to get the license from
- * @param dir string directory to look for the license in if src_id is nil
- * and not 1st stage installation
- * @param patterns a list of patterns for the files, regular expressions
- * with %1 for the language
- * @param boolean enable_back sets the back_button status
- * @param boolean base_product defines whether it is a base or add-on product
- * true means base product, false add-on product
- * @param require_agreement means that even if the license (or the very same license)
- * has been already accepetd, ask user to accept it again (because of 'going back'
- * in the installation proposal).
- */
-global symbol AskLicenseAgreement (integer src_id, string dir,
- list<string> patterns, string action, boolean enable_back,
- boolean base_product, boolean require_agreement)
-{
- string lic_lang = "";
- map licenses = $[];
- list <string> available_langs = [];
+string lic_lang = "";
+symbol InitLicenseData (integer src_id, string dir, map & licenses,
+ list <string> & available_langs, boolean require_agreement, string & license_ident) {
GetSourceLicenseDirectory (src_id, dir);
licenses = LicenseFiles (license_dir,
@@ -638,46 +628,34 @@
if (src_id != nil) {
// use wizard with steps
if (Stage::initial()) {
- Wizard::OpenNextBackStepsDialog();
- WorkflowManager::RedrawWizardSteps();
+ // Wizard::OpenNextBackStepsDialog();
+ // WorkflowManager::RedrawWizardSteps();
+ y2milestone ("Initial stage, not opening any window...");
// use normal wizard
} else {
Wizard::OpenNextBackDialog();
}
}
- DisplayLicenseDialog (available_langs, enable_back, lic_lang, licenses);
- // Display info as a popup if exists
- if (info_file != nil)
- InstShowInfo::show_info_txt (info_file);
+ return `cont;
+}
- // initial loop
- symbol ret = `first;
+// Should have been named 'UpdateLicenseContentBasedOnSelectedLanguage' :->
+void UpdateLicenseContent (map & licenses) {
+ // read the selected language
+ lic_lang = (string) UI::QueryWidget (`id (`lang), `Value);
+ UI::ReplaceWidget (`id (`license_rp), GetLicenseContent (lic_lang, licenses));
+}
- // set timeout for autoinstallation
- // bugzilla #206706
- boolean timeout = false;
- if (Mode::autoinst()) {
- timeout = true;
- }
+symbol HandleLicenseDialogRet (map & licenses, boolean base_product, string action) {
+ symbol ret = nil;
while (true)
{
- // bugzilla #206706
- if (timeout) {
- sleep (2000);
- y2milestone("AutoYaST: License has been accepted after timeout...");
- ret = `accepted;
- break;
- }
-
ret = (symbol) UI::UserInput();
if (ret == `lang) {
- // read the selected language
- lic_lang = (string) UI::QueryWidget (`id (`lang), `Value);
-
- UI::ReplaceWidget (`id (`license_rp), GetLicenseContent (lic_lang, licenses));
+ UpdateLicenseContent (licenses);
// bugzilla #303828
// disabled next button unless yes/no is selected
} else if (ret == `yes || ret == `no) {
@@ -786,6 +764,57 @@
}
}
+ return ret;
+}
+
+/**
+ * Ask user to confirm license agreement
+ * @param src_id integer repository to get the license from
+ * @param dir string directory to look for the license in if src_id is nil
+ * and not 1st stage installation
+ * @param patterns a list of patterns for the files, regular expressions
+ * with %1 for the language
+ * @param boolean enable_back sets the back_button status
+ * @param boolean base_product defines whether it is a base or add-on product
+ * true means base product, false add-on product
+ * @param require_agreement means that even if the license (or the very same license)
+ * has been already accepetd, ask user to accept it again (because of 'going back'
+ * in the installation proposal).
+ */
+global symbol AskLicenseAgreement (integer src_id, string dir,
+ list<string> patterns, string action, boolean enable_back,
+ boolean base_product, boolean require_agreement)
+{
+ lic_lang = "";
+ map licenses = $[];
+ list <string> available_langs = [];
+ string license_ident = "";
+
+ symbol init_ret = InitLicenseData (src_id, dir, licenses, available_langs, require_agreement, license_ident);
+
+ if (init_ret == `auto || init_ret == `accepted) {
+ y2milestone ("Returning %1", init_ret);
+ return init_ret;
+ }
+
+ DisplayLicenseDialog (available_langs, enable_back, lic_lang, licenses);
+
+ // Display info as a popup if exists
+ if (info_file != nil)
+ InstShowInfo::show_info_txt (info_file);
+
+ // initial loop
+ symbol ret = nil;
+
+ // set timeout for autoinstallation
+ // bugzilla #206706
+ if (Mode::autoinst()) {
+ y2milestone("AutoYaST: License has been accepted automatically");
+ ret = `accepted;
+ } else {
+ ret = HandleLicenseDialogRet (licenses, base_product, action);
+ }
+
if (ret == `accepted && license_ident != nil) {
// store already accepted license ID
LicenseHasBeenAccepted (license_ident);
@@ -794,7 +823,7 @@
CleanUpLicense (tmpdir);
// bugzilla #303922
- if (src_id != nil) {
+ if (!Stage::initial() && src_id != nil) {
Wizard::CloseDialog();
}
@@ -824,6 +853,69 @@
enable_back, true, true);
}
+boolean info_file_already_seen = false;
+
+/**
+ * Called from the first stage Welcome dialog by clicking on a button
+ */
+global boolean ShowFullScreenLicenseInInstallation (any replace_point_ID) {
+ lic_lang = "";
+ map licenses = $[];
+ list <string> available_langs = [];
+ string license_ident = "";
+
+ symbol init_ret = InitLicenseData (nil, "", licenses, available_langs, true, license_ident);
+
+ // Replaces the dialog content with Languages combo-box
+ // and the current license text (richtext)
+ UI::ReplaceWidget (
+ `id (replace_point_ID),
+ GetLicenseDialogTerm (available_langs, lic_lang, licenses)
+ );
+
+ symbol ret = nil;
+
+ while (true)
+ {
+ ret = (symbol) UI::UserInput();
+
+ if (ret == `lang) {
+ UpdateLicenseContent (licenses);
+ } else {
+ break;
+ }
+ }
+
+ return true;
+}
+
+/**
+ * Used in the first-stage Welcome dialog
+ */
+global boolean ShowLicenseInInstallation (any replace_point_ID) {
+ lic_lang = "";
+ map licenses = $[];
+ list <string> available_langs = [];
+ string license_ident = "";
+
+ symbol init_ret = InitLicenseData (nil, "", licenses, available_langs, true, license_ident);
+
+ term rt = GetLicenseContent (lic_lang, licenses);
+ UI::ReplaceWidget (`id (replace_point_ID), rt);
+
+ // Display info as a popup if exists
+ if (info_file != nil && ! info_file_already_seen) {
+ if (Mode::autoinst()) {
+ y2milestone ("Autoinstallation: Skipping info file...");
+ } else {
+ InstShowInfo::show_info_txt (info_file);
+ info_file_already_seen = true;
+ }
+ }
+
+ return true;
+}
+
global symbol AskInstalledLicenseAgreement (string directory,
list<string> patterns, string action)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.16/src/modules/SourceDialogs.ycp new/yast2-packager-2.16.18/src/modules/SourceDialogs.ycp
--- old/yast2-packager-2.16.16/src/modules/SourceDialogs.ycp 2007-12-10 15:44:50.000000000 +0100
+++ new/yast2-packager-2.16.18/src/modules/SourceDialogs.ycp 2008-01-29 17:48:55.000000000 +0100
@@ -69,6 +69,23 @@
*/
global void SetURL (string url) {
_url = url;
+
+ map parsed = URL::Parse(_url);
+
+ // check if it's HDD or USB
+ // convert it to the internal representation
+ if (parsed["scheme"]:"" == "hd")
+ {
+ string query = parsed["query"]:"";
+
+ if (regexpmatch(query, "device=/dev/disk/by-id/usb-"))
+ {
+ parsed["scheme"] = "usb";
+
+ _url = URL::Build (parsed);
+ y2milestone("URL %1 is an USB device, changing the scheme to %2", url, _url);
+ }
+ }
}
/**
@@ -76,7 +93,24 @@
* @return string the URL
*/
global string GetURL () {
- return _url;
+ map parsed = URL::Parse(_url);
+ y2internal("_url: %1, parse: %2", _url, parsed);
+
+ // usb scheme is not valid, it's used only internally
+ // convert it for external clients
+ if (parsed["scheme"]:"" == "usb")
+ {
+ parsed["scheme"] = "hd";
+
+ if (parsed["path"]:"" == "")
+ {
+ parsed["path"] = "/";
+ }
+
+ string ret_url = URL::Build (parsed);
+ return ret_url;
+ }
+ else return _url;
}
/**
@@ -241,7 +275,7 @@
"widget" : `custom,
"custom_widget" : `VBox (
// text entry
- `TextEntry( `id( `repo_name ), _("&Repository Name") )
+ `InputField( `id( `repo_name ), _("&Repository Name") )
),
"init" : RepoNameInit,
"store" : RepoNameStore,
@@ -685,6 +719,332 @@
}
+list<string> DetectPartitions(string disk_id)
+{
+ string command = sformat("ls %1-part*", disk_id);
+
+ map out = (map)SCR::Execute(.target.bash_output, command);
+
+ if (out["exit"]:-1 != 0)
+ {
+ y2error("Command %1 failed", command);
+ return [];
+ }
+
+ list<string> ret = splitstring(out["stdout"]:"", "\n");
+ integer ret_size = size(ret);
+
+ // remove empty string at the end
+ if (ret_size > 0 && ret[ret_size - 1]:"dummy" == "")
+ {
+ ret = remove(ret, ret_size - 1);
+ }
+
+ return ret;
+}
+
+string GetDeviceID(list<string> devices)
+{
+ string ret = "";
+
+ foreach(string dev, devices,
+ {
+ if (regexpmatch(dev, "^/dev/disk/by-id/"))
+ {
+ ret = dev;
+ }
+ }
+ );
+
+ return ret;
+}
+
+list