Hello community,
here is the log from the commit of package yast2-installation
checked in at Mon Oct 30 17:53:09 CET 2006.
--------
--- yast2-installation/yast2-installation.changes 2006-10-26 17:20:33.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2006-10-30 17:34:59.000000000 +0100
@@ -1,0 +2,18 @@
+Mon Oct 30 15:10:07 CET 2006 - lslezak@suse.cz
+
+- updated inst_extrasources client to not download files from the
+ installation sources (#213031)
+- requires yast2-pkg-bindings >= 2.13.101
+- 2.14.6
+
+-------------------------------------------------------------------
+Mon Oct 30 12:59:31 CET 2006 - locilka@suse.cz
+
+- Moving ProductFeatures::Save() from inst_kickoff client to
+ save_config_finish - client that is called after the SCR is
+ switched to the running system (#209119).
+- Calling Storage::RemoveDmMapsTo (device) in after the disks are
+ probed in inst_system_analysis (#208222).
+- Fixed including packager.
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.14.5.tar.bz2
New:
----
yast2-installation-2.14.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.TFTzhd/_old 2006-10-30 17:51:35.000000000 +0100
+++ /var/tmp/diff_new_pack.TFTzhd/_new 2006-10-30 17:51:35.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.14.5)
+# spec file for package yast2-installation (Version 2.14.6)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,21 +11,21 @@
# norootforbuild
Name: yast2-installation
-Version: 2.14.5
+Version: 2.14.6
Release: 1
License: GNU General Public License (GPL) - all versions
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.14.5.tar.bz2
+Source0: yast2-installation-2.14.6.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
Requires: yast2-update
Requires: yast2-storage yast2-mouse yast2-bootloader
-# YCP modules were moved back to the yast2-packager (see log for yast2-installation-2.13.155)
-Requires: yast2-packager >= 2.13.152
-# Pkg::ResolvableCountPatches
-Requires: yast2-pkg-bindings >= 2.13.92
+# SourceManager::InstallationSourceOnPartition 2.14.0, bugzilla #208222
+Requires: yast2-packager >= 2.14.0
+# extra sources in ResolvableProperties()
+Requires: yast2-pkg-bindings >= 2.13.101
# ProductControl::Run returning `abort (FATE #300422)
Requires: yast2 >= 2.14.6
# Languages:GetLanguagesMap, bugzilla #204791
@@ -68,7 +68,7 @@
Jiri Srain
%prep
-%setup -n yast2-installation-2.14.5
+%setup -n yast2-installation-2.14.6
%build
%{prefix}/bin/y2tool y2autoconf
@@ -132,6 +132,18 @@
%endif
%changelog -n yast2-installation
+* Mon Oct 30 2006 - lslezak@suse.cz
+- updated inst_extrasources client to not download files from the
+ installation sources (#213031)
+- requires yast2-pkg-bindings >= 2.13.101
+- 2.14.6
+* Mon Oct 30 2006 - locilka@suse.cz
+- Moving ProductFeatures::Save() from inst_kickoff client to
+ save_config_finish - client that is called after the SCR is
+ switched to the running system (#209119).
+- Calling Storage::RemoveDmMapsTo (device) in after the disks are
+ probed in inst_system_analysis (#208222).
+- Fixed including packager.
* Thu Oct 26 2006 - locilka@suse.cz
- Enabling back button in the License Agreement dialog (#215236).
- Adding add-on.rnc for AutoYaST profile validation (#215248).
++++++ yast2-installation-2.14.5.tar.bz2 -> yast2-installation-2.14.6.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.5/VERSION new/yast2-installation-2.14.6/VERSION
--- old/yast2-installation-2.14.5/VERSION 2006-10-26 17:20:16.000000000 +0200
+++ new/yast2-installation-2.14.6/VERSION 2006-10-30 17:33:31.000000000 +0100
@@ -1 +1 @@
-2.14.5
+2.14.6
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.5/configure new/yast2-installation-2.14.6/configure
--- old/yast2-installation-2.14.5/configure 2006-10-26 17:25:04.000000000 +0200
+++ new/yast2-installation-2.14.6/configure 2006-10-30 17:38:01.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-installation 2.14.5.
+# Generated by GNU Autoconf 2.59 for yast2-installation 2.14.6.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-installation'
PACKAGE_TARNAME='yast2-installation'
-PACKAGE_VERSION='2.14.5'
-PACKAGE_STRING='yast2-installation 2.14.5'
+PACKAGE_VERSION='2.14.6'
+PACKAGE_STRING='yast2-installation 2.14.6'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -728,7 +728,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.14.5 to adapt to many kinds of systems.
+\`configure' configures yast2-installation 2.14.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-installation 2.14.5:";;
+ short | recursive ) echo "Configuration of yast2-installation 2.14.6:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-installation configure 2.14.5
+yast2-installation configure 2.14.6
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,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.14.5, which was
+It was created by yast2-installation $as_me 2.14.6, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-installation'
- VERSION='2.14.5'
+ VERSION='2.14.6'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.14.5"
+VERSION="2.14.6"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
@@ -2933,7 +2933,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-installation $as_me 2.14.5, which was
+This file was extended by yast2-installation $as_me 2.14.6, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2988,7 +2988,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-installation config.status 2.14.5
+yast2-installation config.status 2.14.6
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.5/configure.in new/yast2-installation-2.14.6/configure.in
--- old/yast2-installation-2.14.5/configure.in 2006-10-26 17:24:58.000000000 +0200
+++ new/yast2-installation-2.14.6/configure.in 2006-10-30 17:37:57.000000000 +0100
@@ -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.5, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.14.6, 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.5"
+VERSION="2.14.6"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.5/src/clients/inst_addon_update_sources.ycp new/yast2-installation-2.14.6/src/clients/inst_addon_update_sources.ycp
--- old/yast2-installation-2.14.5/src/clients/inst_addon_update_sources.ycp 2006-09-27 09:57:58.000000000 +0200
+++ new/yast2-installation-2.14.6/src/clients/inst_addon_update_sources.ycp 2006-10-30 16:22:24.000000000 +0100
@@ -19,7 +19,7 @@
import "SourceManager";
import "Report";
-include "inst_source_dialogs.ycp";
+include "packager/inst_source_dialogs.ycp";
if ( GetInstArgs::going_back()) // going backwards?
return `auto; // don't execute this once more
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.14.5/src/clients/inst_extrasources.ycp new/yast2-installation-2.14.6/src/clients/inst_extrasources.ycp
--- old/yast2-installation-2.14.5/src/clients/inst_extrasources.ycp 2006-10-12 16:31:33.000000000 +0200
+++ new/yast2-installation-2.14.6/src/clients/inst_extrasources.ycp 2006-10-30 16:22:07.000000000 +0100
@@ -25,7 +25,7 @@
import "Internet";
// editUrl()
-include "inst_source_dialogs.ycp";
+include "packager/inst_source_dialogs.ycp";
// the tag providing location of the additional sources in content file
string content_file_tag = "EXTRAURLS";
@@ -180,121 +180,63 @@
/**
* Dowload and parse content files from current installation sources
+ * @param registered
* @return map Extra URLs for each source: $[ string source_url : list<string> extra_urls ]
*/
-define map > GetExtraURLs()
+define map GetExtraURLs(list<string> registered)
{
- // $[ string source_url : list<string> extra_urls ]
- map > extra_urls = $[];
+ map extra_urls = $[];
- // get all IDs
- list<integer> current_ids = Pkg::SourceGetCurrent(false);
+ list<map> products = Pkg::ResolvableProperties("", `product, "");
+ y2milestone("Products: %1", products);
- // get extra urls for each registered installation source
- foreach(integer src, current_ids,
+ foreach(map product, products,
{
- map info = Pkg::SourceGeneralData(src);
- string url = info["url"]:"";
- y2milestone("Configured source: %1", url);
+ // get the extra sources
+ list<string> extra = (list<string>)product["extra_urls"]:[];
+ list<string> optional = (list<string>)product["optional_urls"]:[];
- if (url != nil && url != "")
+ if (size(extra) > 0)
{
- // get the content file
- string media_content = Pkg::SourceProvideOptionalFile(src, 1, "/content");
- y2milestone("downloaded content file: %1", media_content);
-
- map extra_sources = $[];
- if (media_content != nil && media_content != "")
- {
- string content = (string)SCR::Read (.target.string, media_content);
- list<string> lines = splitstring(content, "\n");
-
- // parse the content file here
- foreach(string line, lines,
+ foreach(string url, extra,
+ {
+ // is the URL already registered?
+ if (!contains(registered, url))
{
- if (substring(line, 0, size(content_file_tag)) == content_file_tag)
- {
- // remove the tag
- string parsed_url = substring(line, size(content_file_tag));
-
- list<string> url_list = splitstring(parsed_url, " ");
-
- foreach(string extra_url, url_list,
- {
- // remove surrounding white spaces
- extra_url = String::CutBlanks(extra_url);
-
- if (extra_url != nil && extra_url != "")
- {
- // add the url to the target list
- extra_sources = add(extra_sources, extra_url, true);
- }
- }
- );
- }
- else if (substring(line, 0, size(optional_tag)) == optional_tag)
- {
- // remove the tag
- string parsed_url = substring(line, size(optional_tag));
-
- list<string> url_list = splitstring(parsed_url, " ");
-
- foreach(string extra_url, url_list,
- {
- // remove surrounding white spaces
- extra_url = String::CutBlanks(extra_url);
-
- if (extra_url != nil && extra_url != "")
- {
- // add the url to the target list
- extra_sources = add(extra_sources, extra_url, false);
- }
- }
- );
- }
+ extra_urls = add(extra_urls, url, true);
}
- );
- }
-
- extra_urls = add(extra_urls, url, extra_sources);
+ else
+ {
+ y2milestone("Source %1 is already registered", url);
+ }
+ }
+ );
}
- }
- );
-
- return extra_urls;
-}
-/**
- * Process map with extra URLs and return source which can be registered
- * @param url_map input map
- * @return list<string> list of URLs to register
- */
-define map URLtoRegister(map > url_map)
-{
- // unregistered sources
- map register_url = $[];
-
- if (url_map != nil)
- {
- foreach (string source_url, map urls, url_map,
+ if (size(optional) > 0)
{
- foreach(string u, boolean deflt, urls,
+ foreach(string url, optional,
{
- // has been the URL already registered?
- if (!haskey(url_map, u))
+ // is the URL already registered?
+ if (!contains(registered, url))
+ {
+ extra_urls = add(extra_urls, url, false);
+ }
+ else
{
- register_url = add(register_url, u, deflt);
+ y2milestone("Source %1 is already registered", url);
}
}
);
+
}
- );
- }
+ }
+ );
- return register_url;
+ y2milestone("Extra sources: %1", extra_urls);
+ return extra_urls;
}
-
/**
* Register the installation sources
* @param url_list list of the sources to register
@@ -342,6 +284,33 @@
return ret;
}
+list<string> RegisteredUrls()
+{
+ list<string> ret = [];
+ // get all registered installation sources
+ list<integer> srcs = Pkg::SourceGetCurrent(false);
+
+ foreach(integer src, srcs,
+ {
+ map general = Pkg::SourceGeneralData(src);
+
+ string url = general["url"]:"";
+
+ if (url != nil && url != "")
+ {
+ ret = add(ret, url);
+ }
+ }
+ );
+
+ // remove duplicates
+ ret = toset(ret);
+
+ y2milestone("Registered sources: %1", ret);
+
+ return ret;
+}
+
//////////////////////////////////////////
if ( GetInstArgs::going_back()) // going backwards?
@@ -366,13 +335,11 @@
return `auto;
}
+list<string> already_registered = RegisteredUrls();
-// $[ string source_url : list