Hello community,
here is the log from the commit of package yast2-installation for openSUSE:Factory
checked in at Mon Jan 18 14:14:08 CET 2010.
--------
--- yast2-installation/yast2-installation.changes 2009-11-24 16:30:22.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-installation/yast2-installation.changes 2010-01-15 17:29:38.000000000 +0100
@@ -1,0 +2,49 @@
+Fri Jan 15 17:29:45 CET 2010 - aschnell@suse.de
+
+- updated control.rnc
+- 2.19.2
+
+-------------------------------------------------------------------
+Thu Jan 7 15:29:13 CET 2010 - jsuchome@suse.cz
+
+- inst_complex_welcome adapted to Language::SwitchToEnglishIfNeeded
+ (bnc#479529)
+- 2.19.1
+
+-------------------------------------------------------------------
+Fri Dec 11 16:48:58 CET 2009 - locilka@suse.cz
+
+- Adapted for new API to ProductLicense (FATE #306295).
+
+-------------------------------------------------------------------
+Wed Dec 9 16:44:34 CET 2009 - locilka@suse.cz
+
+- Package kde4-kdm has been renamed to kdm (SLES, SLED control
+ files) (bnc #561627).
+
+-------------------------------------------------------------------
+Wed Dec 9 14:58:38 CET 2009 - kmachalkova@suse.cz
+
+- Un-check automatic configuration box when user selects update
+ (bnc#537625)
+
+-------------------------------------------------------------------
+Wed Dec 9 14:12:21 CET 2009 - locilka@suse.cz
+
+- Enabled CIM by default (SLES and SLED) (FATE #305583)
+- Adapted RNC for control files
+
+-------------------------------------------------------------------
+Wed Dec 9 12:49:08 CET 2009 - jsrain@suse.cz
+
+- dereference hardlinks when deploying live CD so that it can
+ be also deployed on multiple separate partitions (bnc#549158)
+
+-------------------------------------------------------------------
+Mon Nov 30 14:38:26 CET 2009 - locilka@suse.cz
+
+- Repositories added by inst_addon_update_sources use
+ Pkg::RepositoryAdd that does not need access to network
+ (bnc #557723)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-installation-2.19.0.tar.bz2
New:
----
yast2-installation-2.19.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.zZADmZ/_old 2010-01-18 14:13:13.000000000 +0100
+++ /var/tmp/diff_new_pack.zZADmZ/_new 2010-01-18 14:13:13.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package yast2-installation (Version 2.19.0)
+# spec file for package yast2-installation (Version 2.19.1)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,13 +19,13 @@
Name: yast2-installation
-Version: 2.19.0
+Version: 2.19.1
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.19.0.tar.bz2
+Source0: yast2-installation-2.19.1.tar.bz2
Prefix: /usr
Group: System/YaST
-License: GPL v2 or later
+License: GPLv2+
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite
# xmllint
BuildRequires: libxml2
@@ -48,8 +48,8 @@
Conflicts: yast2-pkg-bindings < 2.17.25
# Mouse-related scripts moved to yast2-mouse
Conflicts: yast2-mouse < 2.18.0
-# BNC #449818: "description_id" in DefaultDesktop
-Requires: yast2-packager >= 2.17.49
+# New API for ProductLicense
+Requires: yast2-packager >= 2.19.2
# Storage::GetCommitInfos() call in include/misc.ycp
Requires: yast2-storage >= 2.18.0
# use in startup scripts
@@ -90,7 +90,7 @@
Summary: YaST2 - Installation Parts
%package devel-doc
-License: GPL v2 or later
+License: GPLv2+
Group: Documentation/HTML
Requires: yast2-installation >= 2.15.34
PreReq: %fillup_prereq
@@ -103,7 +103,7 @@
System installation code as present on installation media.
%prep
-%setup -n yast2-installation-2.19.0
+%setup -n yast2-installation-2.19.1
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-installation-2.19.0.tar.bz2 -> yast2-installation-2.19.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.19.0/configure new/yast2-installation-2.19.1/configure
--- old/yast2-installation-2.19.0/configure 2009-09-04 18:35:06.000000000 +0200
+++ new/yast2-installation-2.19.1/configure 2009-12-22 10:37:13.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-installation 2.18.23.
+# Generated by GNU Autoconf 2.63 for yast2-installation 2.19.0.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-installation'
PACKAGE_TARNAME='yast2-installation'
-PACKAGE_VERSION='2.18.23'
-PACKAGE_STRING='yast2-installation 2.18.23'
+PACKAGE_VERSION='2.19.0'
+PACKAGE_STRING='yast2-installation 2.19.0'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1285,7 +1285,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-installation 2.18.23 to adapt to many kinds of systems.
+\`configure' configures yast2-installation 2.19.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1357,7 +1357,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-installation 2.18.23:";;
+ short | recursive ) echo "Configuration of yast2-installation 2.19.0:";;
esac
cat <<\_ACEOF
@@ -1437,7 +1437,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-installation configure 2.18.23
+yast2-installation configure 2.19.0
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1451,7 +1451,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-installation $as_me 2.18.23, which was
+It was created by yast2-installation $as_me 2.19.0, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2431,7 +2431,7 @@
# Define the identity of the package.
PACKAGE='yast2-installation'
- VERSION='2.18.23'
+ VERSION='2.19.0'
cat >>confdefs.h <<_ACEOF
@@ -2553,7 +2553,7 @@
-VERSION="2.18.23"
+VERSION="2.19.0"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
@@ -3743,7 +3743,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-installation $as_me 2.18.23, which was
+This file was extended by yast2-installation $as_me 2.19.0, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3793,7 +3793,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-installation config.status 2.18.23
+yast2-installation config.status 2.19.0
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.19.0/configure.in new/yast2-installation-2.19.1/configure.in
--- old/yast2-installation-2.19.0/configure.in 2009-09-04 18:35:02.000000000 +0200
+++ new/yast2-installation-2.19.1/configure.in 2009-12-22 10:37:10.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-installation
dnl
-dnl -- This file is generated by y2autoconf 2.18.10 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.18.23, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.19.0, http://bugs.opensuse.org/, yast2-installation)
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.18.23"
+VERSION="2.19.0"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.19.0/control/control.openSUSE.xml new/yast2-installation-2.19.1/control/control.openSUSE.xml
--- old/yast2-installation-2.19.0/control/control.openSUSE.xml 2009-11-24 17:07:58.000000000 +0100
+++ new/yast2-installation-2.19.1/control/control.openSUSE.xml 2009-12-15 10:45:17.000000000 +0100
@@ -267,7 +267,7 @@
<!-- BNC #381821, BNC #438212 -->
<desktop>startkde</desktop>
desktop_kde
- <logon>kdm4</logon>
+ <logon>kdm</logon>
<cursor>DMZ</cursor>
<packages>kdm</packages>
<order config:type="integer">1</order>
@@ -319,17 +319,15 @@
</software>
<partitioning>
- false
true
7GB
40
5GB
20GB
false
- false
+ false
15GB
25GB
- false
</partitioning>
<network>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.19.0/control/control.rnc new/yast2-installation-2.19.1/control/control.rnc
--- old/yast2-installation-2.19.0/control/control.rnc 2009-11-24 16:27:47.000000000 +0100
+++ new/yast2-installation-2.19.1/control/control.rnc 2010-01-15 17:28:09.000000000 +0100
@@ -84,6 +84,7 @@
| runlevel
| debug_deploying
| require_registration
+ | services_proposal
additional_kernel_parameters = element additional_kernel_parameters { text }
incomplete_translation_treshold = element incomplete_translation_treshold { text }
@@ -173,6 +174,17 @@
}+
}
+services_proposal = element services_proposal {
+ LIST,
+ element service {
+ element label_id { text }? &
+ element service_names { text } &
+ element firewall_plugins { text }? &
+ element enabled_by_default { BOOLEAN }? &
+ element packages { text }?
+ }+
+}
+
subworkflows = element subworkflows {
LIST,
element subworkflow {
@@ -338,6 +350,7 @@
| boot_evms
| use_separate_multipath_module
| prefer_remove
+ | vm_keep_unpartitioned_region
| remove_special_partitions
| partitions
@@ -354,6 +367,7 @@
boot_evms = element boot_evms { BOOLEAN }
prefer_remove = element prefer_remove { BOOLEAN }
remove_special_partitions = element remove_special_partitions { BOOLEAN }
+vm_keep_unpartitioned_region = element vm_keep_unpartitioned_region { BOOLEAN }
# used by HASI Add-On
use_separate_multipath_module = element use_separate_multipath_module { BOOLEAN }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.19.0/control/control.rng new/yast2-installation-2.19.1/control/control.rng
--- old/yast2-installation-2.19.0/control/control.rng 2009-11-24 17:08:02.000000000 +0100
+++ new/yast2-installation-2.19.1/control/control.rng 2010-01-15 17:28:18.000000000 +0100
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<grammar xmlns:config="http://www.suse.com/1.0/configns" ns="http://www.suse.com/1.0/yast2ns" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+<grammar ns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<!-- types -->
<define name="BOOLEAN">
<attribute name="config:type">
@@ -92,6 +92,7 @@
<ref name="runlevel"/>
<ref name="debug_deploying"/>
<ref name="require_registration"/>
+ <ref name="services_proposal"/>
</choice>
</define>
<define name="additional_kernel_parameters">
@@ -402,6 +403,40 @@
</oneOrMore>
</element>
</define>
+ <define name="services_proposal">
+ <element name="services_proposal">
+ <ref name="LIST"/>
+ <oneOrMore>
+ <element name="service">
+ <interleave>
+ <optional>
+ <element name="label_id">
+ <text/>
+ </element>
+ </optional>
+ <element name="service_names">
+ <text/>
+ </element>
+ <optional>
+ <element name="firewall_plugins">
+ <text/>
+ </element>
+ </optional>
+ <optional>
+ <element name="enabled_by_default">
+ <ref name="BOOLEAN"/>
+ </element>
+ </optional>
+ <optional>
+ <element name="packages">
+ <text/>
+ </element>
+ </optional>
+ </interleave>
+ </element>
+ </oneOrMore>
+ </element>
+ </define>
<define name="subworkflows">
<element name="subworkflows">
<ref name="LIST"/>
@@ -756,6 +791,7 @@
<ref name="boot_evms"/>
<ref name="use_separate_multipath_module"/>
<ref name="prefer_remove"/>
+ <ref name="vm_keep_unpartitioned_region"/>
<ref name="remove_special_partitions"/>
<ref name="partitions"/>
</choice>
@@ -825,6 +861,11 @@
<ref name="BOOLEAN"/>
</element>
</define>
+ <define name="vm_keep_unpartitioned_region">
+ <element name="vm_keep_unpartitioned_region">
+ <ref name="BOOLEAN"/>
+ </element>
+ </define>
<!-- used by HASI Add-On -->
<define name="use_separate_multipath_module">
<element name="use_separate_multipath_module">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.19.0/control/control.SLED.xml new/yast2-installation-2.19.1/control/control.SLED.xml
--- old/yast2-installation-2.19.0/control/control.SLED.xml 2009-11-24 17:06:34.000000000 +0100
+++ new/yast2-installation-2.19.1/control/control.SLED.xml 2009-12-09 17:08:45.000000000 +0100
@@ -137,6 +137,8 @@
modem
remote
firewall
+ <!-- FATE #305583: Start CIMOM by default -->
+ services
<!-- hardware proposal -->
@@ -175,6 +177,19 @@
<!-- bnc #431259 -->
false
+
+ <!-- Used in services proposal -->
+
+ <!-- FATE #305583: Start CIMOM by default -->
+ <service>
+ <!-- see 'texts' -->
+ service_sfcb
+ sfcb
+ sblim-sfcb
+ true
+ <packages>sblim-sfcb</packages>
+ </service>
+
</globals>
<software>
@@ -224,9 +239,9 @@
<!-- BNC #381821, BNC #438212 -->
<desktop>startkde</desktop>
dummy_desktop
- <logon>kdm4</logon>
+ <logon>kdm</logon>
<cursor>DMZ</cursor>
- <packages>kde4-kdm</packages>
+ <packages>kdm</packages>
<order config:type="integer">1</order>
<patterns>kde x11 base</patterns>
<icon>pattern-kde4</icon>
@@ -350,6 +365,9 @@
<label>Configuring network...</label>
<label>Configuring hardware...</label>
<label>Finishing configuration...</label>
+
+ <!-- FATE #305583: Start CIMOM by default -->
+ <label>CIM Server</label>
</texts>
<proposals config:type="list">
@@ -521,6 +539,11 @@
<name>proxy</name>
70
+ <!-- FATE #305583: Start CIMOM by default -->
+
+ <name>services</name>
+ 15
+
</proposal>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.19.0/control/control.SLES.xml new/yast2-installation-2.19.1/control/control.SLES.xml
--- old/yast2-installation-2.19.0/control/control.SLES.xml 2009-11-24 17:07:57.000000000 +0100
+++ new/yast2-installation-2.19.1/control/control.SLES.xml 2009-12-09 17:08:45.000000000 +0100
@@ -95,6 +95,19 @@
<!-- bnc #431158: Adjusts /etc/sysconfig/security/POLKIT_DEFAULT_PRIVS if set -->
restrictive
+
+ <!-- Used in services proposal -->
+
+ <!-- FATE #305583: Start CIMOM by default -->
+ <service>
+ <!-- see 'texts' -->
+ service_sfcb
+ sfcb
+ sblim-sfcb
+ true
+ <packages>sblim-sfcb</packages>
+ </service>
+
</globals>
<software>
@@ -173,9 +186,9 @@
<!-- BNC #381821, BNC #438212 -->
<desktop>startkde</desktop>
dummy_desktop
- <logon>kdm4</logon>
+ <logon>kdm</logon>
<cursor>DMZ</cursor>
- <packages>kde4-kdm</packages>
+ <packages>kdm</packages>
<order config:type="integer">1</order>
<patterns>kde x11 base</patterns>
<icon>pattern-kde4</icon>
@@ -312,6 +325,9 @@
<label>Physical Machine (Also for Fully Virtualized Guests)</label>
<label>Virtual Machine (For Paravirtualized Environments Like Xen)</label>
<label>Xen Virtualization Host (Local X11 Not Configured by Default)</label>
+
+ <!-- FATE #305583: Start CIMOM by default -->
+ <label>CIM Server</label>
</texts>
<proposals config:type="list">
@@ -636,6 +652,8 @@
ca_mgm
ldap-server
+ <!-- FATE #305583 -->
+ services
</proposal>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.19.0/src/clients/inst_addon_update_sources.ycp new/yast2-installation-2.19.1/src/clients/inst_addon_update_sources.ycp
--- old/yast2-installation-2.19.0/src/clients/inst_addon_update_sources.ycp 2009-11-24 16:27:47.000000000 +0100
+++ new/yast2-installation-2.19.1/src/clients/inst_addon_update_sources.ycp 2009-11-30 18:10:57.000000000 +0100
@@ -89,8 +89,20 @@
boolean again = true;
while (again) {
- integer srcid = Pkg::SourceCreate (url, "/");
- y2milestone ("got %1 from creating %2", srcid, url);
+ // BNC #557723: Repositories migh be created without access to network
+ // Libzypp must not probe the repo
+ map repo_prop = $[
+ "enabled" : true,
+ "autorefresh" : true,
+ "name" : (size(name) > 0 ? name : url),
+ "alias" : (size(name) > 0 ? name : url),
+ "base_urls" : [url],
+ "prod_dir" : "/",
+
+ ];
+
+ integer srcid = Pkg::RepositoryAdd (repo_prop);
+ y2milestone ("got %1 from creating %2/%3", srcid, url, name);
// wrong srcid, must have failed
if (srcid == -1) {
@@ -112,9 +124,6 @@
// everything is ok
} else {
- // bnc #542792
- // Repository name must be set
- Pkg::SourceEditSet([ $["SrcId" : srcid, "name" : name] ]);
added_ids = add (added_ids, srcid);
again = false;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.19.0/src/clients/inst_complex_welcome.ycp new/yast2-installation-2.19.1/src/clients/inst_complex_welcome.ycp
--- old/yast2-installation-2.19.0/src/clients/inst_complex_welcome.ycp 2009-08-26 11:17:05.000000000 +0200
+++ new/yast2-installation-2.19.1/src/clients/inst_complex_welcome.ycp 2010-01-08 15:56:23.000000000 +0100
@@ -20,7 +20,7 @@
* Attention:
* This is still work in progress ...
*
- * $Id: inst_complex_welcome.ycp 58222 2009-07-30 13:48:40Z jsuchome $
+ * $Id: inst_complex_welcome.ycp 60277 2010-01-07 14:29:32Z jsuchome $
*
*/
{
@@ -53,6 +53,8 @@
boolean text_mode = Language::GetTextMode ();
+ string license_ui_id = "base_license";
+
/* ----------------------------------------------------------------------
* Build dialog
* ----------------------------------------------------------------------*/
@@ -221,7 +223,7 @@
language = (string) UI::QueryWidget (`id (`language), `Value);
keyboard = (string) UI::QueryWidget (`id (`keyboard), `Value);
- if (ProductLicense::AcceptanceNeeded()) {
+ if (ProductLicense::AcceptanceNeeded (license_ui_id)) {
license_acc = (boolean) UI::QueryWidget (`id (`license_agreement), `Value);
} else {
license_acc = true;
@@ -240,16 +242,12 @@
}
// Check and set CJK languages
if (Stage::initial () || Stage::firstboot ()) {
- if (ret == `language &&
- Language::CJKLanguage (language) &&
- !Language::CJKLanguage (preselected) &&
- Language::GetTextMode ()) {
- // popup message (user selected CJK language in text mode)
- Popup::Message (_("The selected language cannot be used in text mode. English is used for
-installation, but the selected language will be used for the new system."));
-
- Language::WfmSetGivenLanguage ("en_US");
- } else if (ret == `language) {
+ if (ret == `language && Language::SwitchToEnglishIfNeeded (true))
+ {
+ y2debug ("UI switched to en_US");
+ }
+ else if (ret == `language)
+ {
Console::SelectFont (language);
// no yast translation for nn_NO, use nb_NO as a backup
if (language == "nn_NO")
@@ -295,7 +293,7 @@
return false;
}
- ProductLicense::ShowLicenseInInstallation (`base_license_rp);
+ ProductLicense::ShowLicenseInInstallation (`base_license_rp, Pkg::SourceGetCurrent(true)[0]:0);
// bugzilla #206706
if (Mode::autoinst()) {
@@ -303,7 +301,7 @@
}
// If accepting the license is required, show the check-box
- if (ProductLicense::AcceptanceNeeded()) {
+ if (ProductLicense::AcceptanceNeeded (license_ui_id)) {
UI::ReplaceWidget (`license_checkbox_rp, license_agreement_checkbox);
}
@@ -331,7 +329,7 @@
if (ret == `next ) {
// BNC #448598
// Check whether the license has been accepted only if required
- if (ProductLicense::AcceptanceNeeded() && ! LicenseAccepted ())
+ if (ProductLicense::AcceptanceNeeded (license_ui_id) && ! LicenseAccepted ())
continue;
if (!Language::CheckIncompleteTranslation (language))
@@ -349,7 +347,7 @@
if (ret == `next) break;
} else if (ret == `show_fulscreen_license) {
UI::OpenDialog (AllLicensesDialog());
- ProductLicense::ShowFullScreenLicenseInInstallation (`full_screen_license_rp);
+ ProductLicense::ShowFullScreenLicenseInInstallation (`full_screen_license_rp, Pkg::SourceGetCurrent(true)[0]:0);
UI::CloseDialog();
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.19.0/src/clients/inst_license.ycp new/yast2-installation-2.19.1/src/clients/inst_license.ycp
--- old/yast2-installation-2.19.0/src/clients/inst_license.ycp 2009-08-26 11:17:05.000000000 +0200
+++ new/yast2-installation-2.19.1/src/clients/inst_license.ycp 2009-12-17 11:49:43.000000000 +0100
@@ -6,7 +6,7 @@
* Jiri Srain
* Lukas Ocilka
*
- * $Id: inst_license.ycp 49063 2008-07-14 14:44:04Z locilka $
+ * $Id: inst_license.ycp 60126 2009-12-16 14:43:37Z locilka $
*
*/
@@ -21,6 +21,7 @@
import "Mode";
import "ProductFeatures";
import "Wizard";
+import "Report";
// all the arguments
map argmap = GetInstArgs::argmap();
@@ -53,16 +54,23 @@
if (Stage::initial ())
{
- ask_ret = ProductLicense::AskFirstStageLicenseAgreement (action);
+ ask_ret = ProductLicense::AskFirstStageLicenseAgreement (0, action);
}
else
{
// #304865: Enhance YaST Modules to cooperate better handling the product licenses
string directory = argmap["directory"]:"";
+ // FATE #306295: More licenses in one dialog
+ list <string> directories = argmap["directories"]:[];
+
+ // Priority 0: More directories
+ if (directories != nil && directories != []) {
+ y2milestone ("Using directories: %1", directories);
// Priority 1: Script args
- if (directory != nil && directory != "") {
+ } else if (directory != nil && directory != "") {
y2milestone ("Using directory: %1", directory);
+ directories = [directory];
// Priority 2: Fallback - Control file
} else {
directory = ProductFeatures::GetStringFeature ("globals", "base_product_license_directory");
@@ -75,13 +83,28 @@
directory = "/etc/YaST2/licenses/base/";
y2warning ("No 'base_product_license_directory' set, using %1", directory);
}
+
+ directories = [directory];
}
- if (directory != "")
- directory = Directory::custom_workflow_dir + directory;
+ if (directories != nil) {
+ list <string> tmp_directories = maplist (string one_directory, directories, {
+ return Directory::custom_workflow_dir + one_directory;
+ });
+ directories = tmp_directories;
+ y2milestone ("License directories after additional modifications: %1", directories);
+ }
- // patterns are hardcoded
- ask_ret = ProductLicense::AskInstalledLicenseAgreement (directory, [], action);
+ if (directories == nil || directories == []) {
+ // Error message
+ Report::Error (_("Internal error: Missing license to show"));
+ y2error ("Nothing to do");
+ ask_ret = `auto;
+ } else if (size (directories) > 1) {
+ ask_ret = ProductLicense::AskInstalledLicensesAgreement (directories, action);
+ } else {
+ ask_ret = ProductLicense::AskInstalledLicenseAgreement (directories[0]:"", action);
+ }
}
if (test_mode) Wizard::CloseDialog();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.19.0/src/clients/inst_mode.ycp new/yast2-installation-2.19.1/src/clients/inst_mode.ycp
--- old/yast2-installation-2.19.0/src/clients/inst_mode.ycp 2009-08-26 11:17:05.000000000 +0200
+++ new/yast2-installation-2.19.1/src/clients/inst_mode.ycp 2009-12-09 17:08:45.000000000 +0100
@@ -5,7 +5,7 @@
* Authors: Jiri Srain
* Lukas Ocilka
*
- * $Id: inst_mode.ycp 57174 2009-05-14 11:51:22Z locilka $
+ * $Id: inst_mode.ycp 60026 2009-12-09 14:17:18Z kmachalkova $
*
*/
@@ -319,7 +319,8 @@
[`add_on, Installation::add_on_selected, (ret != `repair)],
[`productsources, Installation::productsources_selected, (show_online_repositories && ret != `repair)],
// automatic installation works only for new installation
- [`use_automatic_configuration, ProductControl::GetUseAutomaticConfiguration(), (ret == `install)],
+ [`use_automatic_configuration, (ProductControl::GetUseAutomaticConfiguration() && ret == `install),
+ (ret == `install)],
], {
if (UI::WidgetExists (`id (one_item[0]:`_inotdef_))) {
UI::ChangeWidget (`id (one_item[0]:`_inotdef_), `Enabled, one_item[2]:false);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.19.0/src/modules/ImageInstallation.ycp new/yast2-installation-2.19.1/src/modules/ImageInstallation.ycp
--- old/yast2-installation-2.19.0/src/modules/ImageInstallation.ycp 2009-09-24 15:56:52.000000000 +0200
+++ new/yast2-installation-2.19.1/src/modules/ImageInstallation.ycp 2009-12-09 17:08:45.000000000 +0100
@@ -907,7 +907,7 @@
cmd = sformat (
"mkfifo %3 ;
mkfifo %4 ;
- tar -C %1 --numeric-owner -cSf %3 --one-file-system . &
+ tar -C %1 --hard-dereference --numeric-owner -cSf %3 --one-file-system . &
dd bs=1048576 if=%3 of=%4 >&2 &
jobs -l >&2;
tar -C %2 --numeric-owner -xSf %4",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.19.0/VERSION new/yast2-installation-2.19.1/VERSION
--- old/yast2-installation-2.19.0/VERSION 2009-11-24 16:27:47.000000000 +0100
+++ new/yast2-installation-2.19.1/VERSION 2010-01-15 14:15:12.000000000 +0100
@@ -1 +1 @@
-2.19.0
+2.19.1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org