Hello community,
here is the log from the commit of package yast2-installation
checked in at Wed Mar 5 21:39:35 CET 2008.
--------
--- yast2-installation/yast2-installation.changes 2008-03-03 21:12:52.000000000 +0100
+++ yast2-installation/yast2-installation.changes 2008-03-05 18:55:10.000000000 +0100
@@ -1,0 +2,17 @@
+Wed Mar 5 18:52:30 CET 2008 - locilka@suse.cz
+
+- Remember (first stage) and restore (second stage) DisabledModules
+ (bnc #364066).
+- 2.16.20
+
+-------------------------------------------------------------------
+Wed Mar 5 16:30:22 CET 2008 - locilka@suse.cz
+
+- Using client country_simple instead of timezone and language in
+ the installation overview (FATE #302980).
+- Using new users client in that overview too (FATE #302980).
+- Do not remove already registered installation repositories during
+ upgrade if they match the old repositories on system
+ (bnc #360109).
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.16.19.tar.bz2
New:
----
yast2-installation-2.16.20.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.nZ7935/_old 2008-03-05 21:37:10.000000000 +0100
+++ /var/tmp/diff_new_pack.nZ7935/_new 2008-03-05 21:37:10.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.16.19)
+# spec file for package yast2-installation (Version 2.16.20)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-installation
-Version: 2.16.19
-Release: 12
+Version: 2.16.20
+Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.16.19.tar.bz2
+Source0: yast2-installation-2.16.20.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite
# URL::MakeParamsFromMap and URL::MakeMapFromParams
@@ -104,7 +104,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-installation-2.16.19
+%setup -n yast2-installation-2.16.20
%build
%{prefix}/bin/y2tool y2autoconf
@@ -170,6 +170,17 @@
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{prefix}/share/doc/packages/yast2-installation/README
%changelog
+* Wed Mar 05 2008 locilka@suse.cz
+- Remember (first stage) and restore (second stage) DisabledModules
+ (bnc #364066).
+- 2.16.20
+* Wed Mar 05 2008 locilka@suse.cz
+- Using client country_simple instead of timezone and language in
+ the installation overview (FATE #302980).
+- Using new users client in that overview too (FATE #302980).
+- Do not remove already registered installation repositories during
+ upgrade if they match the old repositories on system
+ (bnc #360109).
* Mon Mar 03 2008 coolo@suse.de
- trying to change defaults for running gdb (arvin's patch)
* Mon Mar 03 2008 locilka@suse.cz
++++++ yast2-installation-2.16.19.tar.bz2 -> yast2-installation-2.16.20.tar.bz2 ++++++
++++ 4451 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.16.19/configure.in new/yast2-installation-2.16.20/configure.in
--- old/yast2-installation-2.16.19/configure.in 2008-02-14 19:09:33.000000000 +0100
+++ new/yast2-installation-2.16.20/configure.in 2008-01-14 13:56:46.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-installation
dnl
-dnl -- This file is generated by y2autoconf 2.16.4 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.2 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.16.18, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.16.9, 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.16.18"
+VERSION="2.16.9"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
@@ -108,7 +108,7 @@
dnl no need for AC_ARG_VAR
AC_PATH_PROG(XGETTEXT, xgettext)
if test -z "$XGETTEXT" ; then
- AC_MSG_ERROR(xgettext is missing; please install gettext-tools.)
+ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
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.16.19/control/docs/control-doc.xml new/yast2-installation-2.16.20/control/docs/control-doc.xml
--- old/yast2-installation-2.16.19/control/docs/control-doc.xml 2007-12-05 10:06:46.000000000 +0100
+++ new/yast2-installation-2.16.20/control/docs/control-doc.xml 2007-05-18 10:44:02.000000000 +0200
@@ -28,7 +28,7 @@
0.1
</revnumber>
<date>
- $Date: 2004-10-27 16:25:24 +0200 (Mi, 27 Okt 2004) $
+ $Date: 2004-10-27 16:25:24 +0200 (Wed, 27 Oct 2004) $
</date>
<revremark>Initial Release as PDF</revremark>
</revision>
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.16.19/src/clients/inst_finish.ycp new/yast2-installation-2.16.20/src/clients/inst_finish.ycp
--- old/yast2-installation-2.16.19/src/clients/inst_finish.ycp 2008-02-14 19:09:20.000000000 +0100
+++ new/yast2-installation-2.16.20/src/clients/inst_finish.ycp 2008-03-05 18:55:29.000000000 +0100
@@ -6,7 +6,7 @@
* Arvin Schnell
* Jiri Srain
*
- * $Id: inst_finish.ycp 44068 2008-01-31 14:03:59Z jsuchome $
+ * $Id: inst_finish.ycp 45244 2008-03-05 17:55:29Z locilka $
*
* Writes:
* [target] /var/lib/YaST2/runme_at_boot run yast2 after initial boot
@@ -84,6 +84,7 @@
"save_hw_status",
"users",
"autoinst_scripts2",
+ "installation_settings",
],
],
$[
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.16.19/src/clients/inst_installation_settings.ycp new/yast2-installation-2.16.20/src/clients/inst_installation_settings.ycp
--- old/yast2-installation-2.16.19/src/clients/inst_installation_settings.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-2.16.20/src/clients/inst_installation_settings.ycp 2008-03-05 18:40:03.000000000 +0100
@@ -0,0 +1,42 @@
+/**
+ * File: clients/inst_installation_settings.ycp
+ * Package: Installation
+ * Summary: Installation - save settings (used later in second stage, or ...).
+ * See bnc #364066.
+ * Authors: Lukas Ocilka
+ *
+ * $Id:$
+ *
+ */
+
+{
+ textdomain "installation";
+
+ import "ProductControl";
+ import "InstData";
+
+ if (ProductControl::DisabledModules == nil) {
+ y2error ("Wrong definition of DisabledModules");
+ return true;
+ }
+
+ if (InstData::wizardsteps_disabled_modules == nil) {
+ y2error ("Path to write disabled modules is not defined!");
+ return true;
+ }
+
+ y2milestone (
+ "Writing disabled modules %1 into %2",
+ ProductControl::DisabledModules,
+ InstData::wizardsteps_disabled_modules
+ );
+
+ if ((boolean) SCR::Write (.target.ycp, InstData::wizardsteps_disabled_modules, ProductControl::DisabledModules) != true) {
+ y2error ("Cannot write disabled modules");
+ return true;
+ }
+
+ y2milestone ("Successful");
+
+ return true;
+}
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.16.19/src/clients/inst_upgrade_urls.ycp new/yast2-installation-2.16.20/src/clients/inst_upgrade_urls.ycp
--- old/yast2-installation-2.16.19/src/clients/inst_upgrade_urls.ycp 2008-01-25 11:11:01.000000000 +0100
+++ new/yast2-installation-2.16.20/src/clients/inst_upgrade_urls.ycp 2008-03-03 17:01:00.000000000 +0100
@@ -179,7 +179,7 @@
boolean ret = false;
foreach (map one_url, already_registered_repos, {
- if (baseurl == one_url["media_url"]:"-A-") {
+ if (baseurl == one_url["url"]:"-A-") {
ret = true;
break;
}
@@ -197,7 +197,7 @@
integer ret = nil;
foreach (map one_url, already_registered_repos, {
- if (baseurl == one_url["media_url"]:"-A-") {
+ if (baseurl == one_url["url"]:"-A-") {
ret = one_url["media"]:-1;
break;
}
@@ -277,7 +277,7 @@
urls[currentitem, "url"] = url;
}
- symbol HandleOldSources () {
+ void UseOldOrNewURLs () {
urls = [];
// If some new (since 10.3 Alpha?) URLs found, use only them
@@ -287,6 +287,7 @@
// bugzilla #300901
boolean enabled = nil;
+ // mapping url (zypp-based) keys to keys used in pkg-bindings
if (is (one_url_map["enabled"]:0, integer)) {
enabled = (one_url_map["enabled"]:0 == 1);
} else if (is (one_url_map["enabled"]:"0", string)) {
@@ -319,7 +320,42 @@
one_url["initial_url_status"] = one_url["url_will_be_enabled"]:false;
return one_url;
});
+ }
+
+ /**
+ * Function removes repositories already registered by the installation
+ * from list of urls found on the system.
+ */
+ void RemoveInstallationReposFromUpgrededSystemOnes () {
+ // All already registered repos
+ foreach (map one_registered_repo, already_registered_repos, {
+ // if an installation repository is enabled, skip it
+ if (one_registered_repo["enabled"]:true == false)
+ return;
+
+ string registered_url = one_registered_repo["url"]:"-A-";
+ string registered_name = one_registered_repo["name"]:"-A-";
+ string registered_dir = one_registered_repo["product_dir"]:"-A-";
+
+ // Remove them from repos being offered to user to enable/disable them
+ // Don't handle them at all, they have to stay untouched
+ // See bnc #360109
+ urls = filter (map one_from_urls, urls, {
+ string one_url = one_from_urls["url"]:"-B-";
+ string one_name = one_from_urls["name"]:"-B-";
+ string one_dir = one_from_urls["product_dir"]:"-B-";
+
+ if (registered_url == one_url && registered_name == one_name && registered_dir == one_dir) {
+ y2milestone ("The same product (url) already in use, not handling it %1", one_registered_repo);
+ return true;
+ } else {
+ return false;
+ }
+ });
+ });
+ }
+ symbol HandleOldSources () {
y2milestone ("Offering: %1", urls);
y2milestone ("Already registered: %1", already_registered_repos);
@@ -655,6 +691,7 @@
Progress::NextStage();
boolean continue_processing = false;
+
if ((old_urls != nil && old_urls != []) || (new_urls != nil && new_urls != [])) {
continue_processing = true;
// initialize zypp
@@ -663,18 +700,22 @@
foreach (integer one_id, Pkg::SourceGetCurrent (true), {
map source_data = Pkg::SourceGeneralData (one_id);
+ source_data["media"] = one_id;
- already_registered_repos = add (already_registered_repos, $[
- "media_url" : source_data["url"]:"",
- "product_dir" : source_data["product_dir"]:"",
- "media" : one_id,
- ]);
+ already_registered_repos = add (already_registered_repos, source_data);
});
}
+ UseOldOrNewURLs();
+ RemoveInstallationReposFromUpgrededSystemOnes();
+
Progress::NextStage();
Progress::Finish();
+ if (size (already_registered_repos) < 1) {
+ continue_processing = false;
+ }
+
if (! continue_processing) {
y2milestone ("No sources found");
return ret;
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.16.19/src/clients/inst_worker_continue.ycp new/yast2-installation-2.16.20/src/clients/inst_worker_continue.ycp
--- old/yast2-installation-2.16.19/src/clients/inst_worker_continue.ycp 2008-02-14 19:09:20.000000000 +0100
+++ new/yast2-installation-2.16.20/src/clients/inst_worker_continue.ycp 2008-03-05 18:20:28.000000000 +0100
@@ -54,6 +54,8 @@
// All stages
SetUIContent();
+ AdjustDisabledModules();
+
SetDiskActivationModule();
UpdateWizardSteps ();
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.16.19/src/include/inst_inc_second.ycp new/yast2-installation-2.16.20/src/include/inst_inc_second.ycp
--- old/yast2-installation-2.16.19/src/include/inst_inc_second.ycp 2007-12-05 10:06:47.000000000 +0100
+++ new/yast2-installation-2.16.20/src/include/inst_inc_second.ycp 2008-03-05 18:28:25.000000000 +0100
@@ -24,11 +24,33 @@
import "Service";
import "Progress";
import "Wizard";
+ import "InstData";
// The order of services is important
// especially for starting them
list <string> inst_network_services = ["network", "portmap", "SuSEfirewall2_setup"];
+ void AdjustDisabledModules () {
+ if (InstData::wizardsteps_disabled_modules == nil) {
+ y2error ("Disabled modules file not defined");
+ return;
+ }
+
+ if (! FileUtils::Exists (InstData::wizardsteps_disabled_modules)) {
+ y2milestone ("File %1 doesn't exist, skipping...", InstData::wizardsteps_disabled_modules);
+ return;
+ }
+
+ list <string> disabled_modules = (list <string>) SCR::Read (.target.ycp, InstData::wizardsteps_disabled_modules);
+ if (disabled_modules == nil) {
+ y2error ("Error reading %1", InstData::wizardsteps_disabled_modules);
+ return;
+ }
+
+ ProductControl::DisabledModules = disabled_modules;
+ y2milestone ("Disabled modules set to %1", ProductControl::DisabledModules);
+ }
+
/**
* Stores the current status of network services into
* Installation::reboot_net_settings file
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.16.19/src/modules/InstData.ycp new/yast2-installation-2.16.20/src/modules/InstData.ycp
--- old/yast2-installation-2.16.19/src/modules/InstData.ycp 2008-02-26 21:41:02.000000000 +0100
+++ new/yast2-installation-2.16.20/src/modules/InstData.ycp 2008-03-05 18:11:19.000000000 +0100
@@ -15,6 +15,8 @@
textdomain "installation";
module "InstData";
+ import "Directory";
+
// --> system analysis
global string start_mode = nil;
@@ -37,6 +39,10 @@
global boolean product_license_accepted = false;
+ // keep steps disabled in first stage also disabled in second stage
+ // see bnc #364066
+ global string wizardsteps_disabled_modules = Directory::vardir + "/installation_disabled_steps";
+
// <-- other
/* EOF */
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.16.19/VERSION new/yast2-installation-2.16.20/VERSION
--- old/yast2-installation-2.16.19/VERSION 2008-02-21 06:23:01.000000000 +0100
+++ new/yast2-installation-2.16.20/VERSION 2008-03-05 18:52:23.000000000 +0100
@@ -1 +1 @@
-2.16.19
+2.16.20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org