Hello community,
here is the log from the commit of package yast2-installation
checked in at Mon Oct 23 18:38:39 CEST 2006.
--------
--- yast2-installation/yast2-installation.changes 2006-10-18 16:21:25.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2006-10-23 16:32:41.000000000 +0200
@@ -1,0 +2,13 @@
+Mon Oct 23 16:04:30 CEST 2006 - locilka@suse.cz
+
+- Added special installation client for Language Add-Ons
+ inst_language_add-on and it's XML workflow
+ add-on-template_installation.xml for calling this client after
+ the Add-On Product is added by the add-on client (FATE #301239).
+- Adding add-on client to list of clients that are enabled for
+ AutoYaST cloning (bugzilla #198927).
+- Added summary of the Release Notes client for the Control Center
+ (bugzilla #213878).
+- 2.14.4
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.14.3.tar.bz2
New:
----
yast2-installation-2.14.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.J0wzmJ/_old 2006-10-23 18:38:31.000000000 +0200
+++ /var/tmp/diff_new_pack.J0wzmJ/_new 2006-10-23 18:38:31.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.14.3)
+# spec file for package yast2-installation (Version 2.14.4)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-installation
-Version: 2.14.3
+Version: 2.14.4
Release: 1
License: GNU General Public License (GPL) - all versions
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.14.3.tar.bz2
+Source0: yast2-installation-2.14.4.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-core-devel yast2-country yast2-devtools yast2-testsuite
Requires: yast2-slp yast2-firewall
@@ -68,7 +68,7 @@
Jiri Srain
%prep
-%setup -n yast2-installation-2.14.3
+%setup -n yast2-installation-2.14.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -131,6 +131,16 @@
%endif
%changelog -n yast2-installation
+* Mon Oct 23 2006 - locilka@suse.cz
+- Added special installation client for Language Add-Ons
+ inst_language_add-on and it's XML workflow
+ add-on-template_installation.xml for calling this client after
+ the Add-On Product is added by the add-on client (FATE #301239).
+- Adding add-on client to list of clients that are enabled for
+ AutoYaST cloning (bugzilla #198927).
+- Added summary of the Release Notes client for the Control Center
+ (bugzilla #213878).
+- 2.14.4
* Wed Oct 18 2006 - locilka@suse.cz
- Added a life-belt into the second stage installation. It can be
restarted under these circumstances:
@@ -703,9 +713,9 @@
- 2.13.65
* Tue Apr 11 2006 - jdsn@suse.de
- in inst_suse_register:
-- resized popups (hmuelle)
-- new info pupop showing new update server (aj)
-- removed cancel button (#164801, shorn)
+ - resized popups (hmuelle)
+ - new info pupop showing new update server (aj)
+ - removed cancel button (#164801, shorn)
- 2.13.64
* Tue Apr 11 2006 - fehr@suse.de
- flag for evms in control.SLES.xml needs to be true
@@ -751,9 +761,9 @@
* Fri Mar 31 2006 - mvidner@suse.cz
- Tell ZMD to get the inst source (#156030)
- No unlocking after all (#160319)
-- Don't reset zypp
-- Reenable Back
-- Fetch update source from suse_resigster and add it
+ - Don't reset zypp
+ - Reenable Back
+ - Fetch update source from suse_resigster and add it
- 2.13.55
* Thu Mar 30 2006 - mvidner@suse.cz
- Reset zypp and release its lock before suse_register (#160319).
@@ -2148,13 +2158,13 @@
from "Cancel" to "Do Not Accept" (bug #21874)
* Fri Dec 20 2002 - arvin@suse.de
- merged from 8.1 branch:
-- only set hostname during vnc installation if necessary
+ - only set hostname during vnc installation if necessary
(bug #21454)
-- popup with info.txt (EULA) now has a timeout during
+ - popup with info.txt (EULA) now has a timeout during
autoinstallation (bug #21413)
-- remove /root/.vnc/passwd after installation (bug #21360)
-- popup with info.txt now has two buttons (accept and cancel)
-- start portmapper if instmode==nfs also on s390 (#21094)
+ - remove /root/.vnc/passwd after installation (bug #21360)
+ - popup with info.txt now has two buttons (accept and cancel)
+ - start portmapper if instmode==nfs also on s390 (#21094)
* Thu Dec 12 2002 - jsrain@suse.de
- added handling of modules required to be loaded early after
mounting root
++++++ yast2-installation-2.14.3.tar.bz2 -> yast2-installation-2.14.4.tar.bz2 ++++++
++++ 2123 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.14.3/VERSION new/yast2-installation-2.14.4/VERSION
--- old/yast2-installation-2.14.3/VERSION 2006-10-18 15:53:56.000000000 +0200
+++ new/yast2-installation-2.14.4/VERSION 2006-10-23 16:45:00.000000000 +0200
@@ -1 +1 @@
-2.14.3
+2.14.4
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.14.3/configure.in new/yast2-installation-2.14.4/configure.in
--- old/yast2-installation-2.14.3/configure.in 2006-10-18 16:25:12.000000000 +0200
+++ new/yast2-installation-2.14.4/configure.in 2006-10-23 16:45:30.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.14.3, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.14.4, http://bugs.opensuse.org/, yast2-installation)
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.14.3"
+VERSION="2.14.4"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.14.3/control/README new/yast2-installation-2.14.4/control/README
--- old/yast2-installation-2.14.3/control/README 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-2.14.4/control/README 2006-10-23 16:02:27.000000000 +0200
@@ -0,0 +1,28 @@
+Products:
+---------
+ For the various products starting from SuSE Linux 9.1, several product
+ control packages have been created and more will follow for future
+ products. Those special package are used when creating the CDs and they
+ install the control file into the first CD of the product.
+
+ Any modification to the control file in the CVS tree of YaST wont
+ appear in the respective products. Such changes have to be done in the
+ following packages instead:
+
+ - skelcd-control-SLD
+ - skelcd-control-SLES
+ - skelcd-control-SUSELinux-Prof
+ - skelcd-control-SUSELinux-Pers
+
+Add-On Products:
+----------------
+ - add-on-template_installation
+
+ This file is a template for adding a workflow to the
+ Language Add-On Product. It should be saved under the root directory
+ of the add-on product as 'installation.xml'.
+
+ Currently it uses these clients
+ * inst_language_add-on
+ * inst_rpmcopy (inside inst_language_add-on)
+ * inst_suseconfig (inside inst_language_add-on)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.14.3/control/control.xml new/yast2-installation-2.14.4/control/control.xml
--- old/yast2-installation-2.14.3/control/control.xml 2006-09-28 21:16:04.000000000 +0200
+++ new/yast2-installation-2.14.4/control/control.xml 2006-10-23 16:15:54.000000000 +0200
@@ -58,6 +58,7 @@
nis
ldap
printer
+ add-on
<texts>
<congratulate>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.14.3/control/docs/README new/yast2-installation-2.14.4/control/docs/README
--- old/yast2-installation-2.14.3/control/docs/README 2006-10-09 16:09:03.000000000 +0200
+++ new/yast2-installation-2.14.4/control/docs/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
- For the various products starting from SuSE Linux 9.1, several product
- control packages have been created and more will follow for future
- products. Those special package are used when creating the CDs and they
- install the control file into the first CD of the product.
-
- Any modification to the control file in the CVS tree of YaST wont
- appear in the respective products. Such changes have to be done in the
- following packages instead:
-
- - skelcd-control-SLD
- - skelcd-control-SLES
- - skelcd-control-SUSELinux-Prof
- - skelcd-control-SUSELinux-Pers
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.14.3/src/clients/inst_language_add-on.ycp new/yast2-installation-2.14.4/src/clients/inst_language_add-on.ycp
--- old/yast2-installation-2.14.3/src/clients/inst_language_add-on.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-2.14.4/src/clients/inst_language_add-on.ycp 2006-10-23 16:04:13.000000000 +0200
@@ -0,0 +1,284 @@
+/**
+ * File: clients/inst_language_add-on.ycp
+ * Authors: Lukas Ocilka
+ * Summary: Template client for language Add-On products
+ *
+ * This is a template for Language Add-Ons. It can be either called
+ * from the installation.xml in the root ("/") of the product or
+ * called from command-line for testing purposes:
+ * `yast2 inst_language_add-on.ycp "$[]" url_to_add_on_source`.
+ *
+ * $Id$
+ */
+{
+ import "Pkg";
+ import "Language";
+ import "Wizard";
+ import "Label";
+ import "Popup";
+
+ textdomain "installation";
+
+ /**
+ * Returns the list of available languages. It is based on the
+ * "LINGUAS" entry in the /content file. Returns nil if something
+ * is wrong.
+ *
+ * @return list <string> supported languages
+ * (e.g., ["af", "ar", "be_BY", "bg", "ca", "cs", "cy", "da", "el", "et", "fi"])
+ */
+ list <string> GetListOfSupportedLanguages (integer source) {
+ string content_file = Pkg::SourceProvideFile (source, 1, "/content");
+ if (content_file == nil || content_file == "") {
+ y2error ("There is no content file!");
+ return nil;
+ }
+
+ SCR::RegisterAgent (.media.content, `ag_ini(
+ `IniAgent( content_file,
+ $[
+ "options" : [ "read_only", "global_values", "flat" ],
+ "comments" : [ "^#.*", "^[ \t]*$", ],
+ "params" : [
+ $[ "match" : [ "^[ \t]*([a-zA-Z0-9_\.]+)[ \t]*(.*)[ \t]*$", "%s %s" ] ]
+ ]
+ ]
+ )));
+ string supported_languages = tostring (SCR::Read (.media.content.LINGUAS));
+ if (supported_languages == nil || supported_languages == "") {
+ y2error ("No languages [LINGUAS] defined!");
+ return nil;
+ }
+
+ y2milestone("Languages found: %1", supported_languages);
+ SCR::UnregisterAgent (.media.content);
+
+ return splitstring (supported_languages, " ");
+ }
+
+ /**
+ * Solves dependencies and installs packages
+ */
+ boolean Install (list <string> languages_to_install) {
+ y2milestone ("Installing packages for languages: %1", languages_to_install);
+ Pkg::SetAdditionalLocales (languages_to_install);
+
+ y2milestone("Solving dependencies");
+ if (Pkg::PkgSolve(true) != true) {
+ y2error("Cannot solve dependencies");
+ return false;
+ }
+
+ y2milestone("Installing packages");
+ WFM::call("inst_rpmcopy");
+ WFM::call("inst_suseconfig");
+
+ Popup::Message (
+ // TRANSLATORS: popup message
+ _("Installation of the Language Extension has been finished.")
+ );
+
+ return true;
+ }
+
+ /**
+ * Only when WFM::Args[1] contains an URL to be added
+ */
+ void InitFunction () {
+ list args = WFM::Args();
+ y2milestone ("Args: %1", args);
+ string add_on_url = tostring (args[1]:"");
+
+ if (add_on_url == "") {
+ y2milestone("No URL given as an argument, not initializing source.");
+ return;
+ }
+
+ y2milestone ("Using URL: '%1'", add_on_url);
+
+ import "PackageCallbacksInit";
+ import "SourceManager";
+
+ PackageCallbacksInit::InitPackageCallbacks();
+
+ Pkg::TargetInit ("/", true);
+ Pkg::SourceStartManager (true);
+
+ SourceManager::createSource (add_on_url);
+ }
+
+ // Dialog definitions -->
+
+ void Dialog_Init () {
+ Wizard::SetContentsButtons(
+ // TRANSLATORS: dialog caption
+ _("Add-On Product Installation"),
+ // TRANSLATORS: dialog content - a very simple label
+ `Label(_("Initializing...")),
+ // TRANSLATORS: help text
+ _("<p>Initializing add-on products...</p>"),
+ Label::BackButton(),
+ Label::NextButton()
+ );
+ Wizard::SetDesktopIcon("yast-language");
+ Wizard::DisableBackButton();
+ Wizard::DisableAbortButton();
+ Wizard::DisableNextButton();
+ }
+
+ list <string> Dialog_SelectLanguagesUI (map & known_languages) {
+ list <term> items = [];
+ foreach (string short, string long, known_languages, {
+ items = add (items, `item (`id (short), long));
+ });
+
+ items = sort (term x, term y, items, ``(x[1]:"" < y[1]:""));
+ Wizard::SetContentsButtons(
+ // TRANSLATORS: dialog caption
+ _("Add-On Product Installation"),
+ // TRANSLATORS: dialog content - a very simple label
+ `VBox (
+ `HBox (
+ `HStretch (),
+ `MultiSelectionBox (
+ `id ("languages"),
+ // TRANSLATORS:: multi-selection box
+ _("&Select Language Extensions to Be Installed"),
+ items
+ ),
+ `HStretch ()
+ )
+ ),
+ // TRANSLATORS: help text
+ _("<p>Select language extensions to be installed and click <b>Accept</b>.</p>"),
+ Label::BackButton(),
+ Label::AcceptButton()
+ );
+ Wizard::SetDesktopIcon("yast-language");
+ Wizard::DisableBackButton();
+ Wizard::EnableAbortButton();
+ Wizard::EnableNextButton();
+
+ list <string> selected_languages = nil;
+ any ret = nil;
+ while (true) {
+ ret = UI::UserInput();
+
+ if (ret == `cancel || ret == `abort) {
+ if (Popup::YesNo(
+ // TRANSLATORS: popup question
+ _("Are you sure you want to abort the Add-On product installation?")
+ )) {
+ selected_languages = [];
+ break;
+ }
+ } else if (ret == `next) {
+ selected_languages = (list <string>) UI::QueryWidget(`id ("languages"), `SelectedItems);
+ if (size (selected_languages) == 0) {
+ if (! Popup::YesNo (
+ _("There are no selected languages to be installed.
+Are you sure you want to abort the installation?")
+ )) {
+ continue;
+ } else {
+ y2warning ("User decided not to install any language support.");
+ }
+ }
+
+ break;
+ }
+ }
+
+ return selected_languages;
+ }
+
+ list <string> Dialog_SelectLanguages (list <string> available_languages) {
+ if (available_languages == nil || available_languages == []) {
+ y2error ("No availabel languages");
+ return nil;
+ } else if (size (available_languages) == 1) {
+ y2milestone ("Only one language available, using %1", available_languages);
+ return available_languages;
+ } else {
+ map known_languages = Language::GetLanguagesMap(false);
+
+ map short_to_lang = $[];
+ foreach (string one_lang, available_languages, {
+ // full xx_YY
+ if (known_languages[one_lang]:nil != nil) {
+ short_to_lang[one_lang] = known_languages[one_lang,4]:"";
+ // xx only without _YY
+ } else {
+ boolean found = false;
+ foreach (string lang_short, list lang_params, known_languages, {
+ if (regexpmatch(lang_short, sformat("%1_.*", one_lang))) {
+ short_to_lang[one_lang] = tostring(lang_params[4]:"");
+ found = true;
+ break;
+ }
+ });
+ if (! found) {
+ y2warning ("Couldn't find language for '%1'", one_lang);
+ // TRANSLATORS: multiselection box item, %1 stands for 'ar', 'mk', 'zh_TW'
+ // it used only as a fallback
+ short_to_lang[one_lang] = sformat (_("Language %1"), one_lang);
+ }
+ }
+ });
+
+ y2milestone("%1", short_to_lang);
+ list <string> selected_languages = Dialog_SelectLanguagesUI (short_to_lang);
+
+ return selected_languages;
+ }
+ }
+
+ // Dialog definitions <--
+
+ integer MainFunction () {
+ Dialog_Init ();
+
+ // This call can be removed
+ InitFunction ();
+
+ // Finding out the source, can be also used AddOnProduct::src_id
+ // but this is better for testing
+ list <integer> all_sources = Pkg::SourceGetCurrent (true);
+ all_sources = sort (integer x, integer y, all_sources, ``(x < y));
+ integer source = all_sources[size(all_sources) - 1]:-1;
+ Pkg::SourceSetEnabled (source, true);
+
+ // one language -> preselect it and install
+ // more languages -> let user decides
+ list <string> available_languages = GetListOfSupportedLanguages (source);
+ if (available_languages == nil || available_languages == []) {
+ y2error ("No languages available!");
+ return 10;
+ }
+
+ list <string> selected_languages = Dialog_SelectLanguages (available_languages);
+ if (selected_languages == nil || selected_languages == []) {
+ y2warning("User did not select any language, finishing...");
+ return 15;
+ }
+
+ if (Install (selected_languages) != true) {
+ y2error("Error occured during installation");
+ return 20;
+ }
+
+ return 0;
+ }
+
+ Wizard::CreateDialog();
+ y2milestone("====================[ Language Add-On Script ]====================");
+ integer ret = MainFunction ();
+ y2milestone("====================[ Language Add-On Script ]====================");
+ Wizard::CloseDialog();
+
+ if (ret == 0) {
+ return `next;
+ } else {
+ return `abort;
+ }
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.14.3/src/config/release_notes.desktop new/yast2-installation-2.14.4/src/config/release_notes.desktop
--- old/yast2-installation-2.14.3/src/config/release_notes.desktop 2006-06-26 09:10:56.000000000 +0200
+++ new/yast2-installation-2.14.4/src/config/release_notes.desktop 2006-10-23 16:33:01.000000000 +0200
@@ -11,4 +11,4 @@
Exec=/sbin/yast2 inst_release_notes
Name=Release Notes
-GenericName=release_notes
+GenericName=Show Release Notes
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org