Hello community,
here is the log from the commit of package yast2-installation
checked in at Mon Jul 30 22:10:40 CEST 2007.
--------
--- yast2-installation/yast2-installation.changes 2007-07-26 17:57:16.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2007-07-30 12:46:58.000000000 +0200
@@ -1,0 +2,14 @@
+Mon Jul 30 12:38:31 CEST 2007 - locilka@suse.cz
+
+- Added inst_upgrade_urls client which offers URLs used on the
+ system to be used during the upgrade as well (FATE #301785).
+- Calling the client from control file.
+- Adjusted RPM dependencies (.anyxml SCR agent).
+- 2.15.37
+
+-------------------------------------------------------------------
+Sun Jul 29 22:39:31 CEST 2007 - locilka@suse.cz
+
+- Fixed curl parameters for network test in first stage (#295484).
+
+-------------------------------------------------------------------
@@ -11 +25 @@
-- 2.13.35
+- 2.15.35
Old:
----
yast2-installation-2.15.36.tar.bz2
New:
----
yast2-installation-2.15.37.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.v26481/_old 2007-07-30 22:09:33.000000000 +0200
+++ /var/tmp/diff_new_pack.v26481/_new 2007-07-30 22:09:33.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.15.36)
+# spec file for package yast2-installation (Version 2.15.37)
#
# Copyright (c) 2007 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.15.36
+Version: 2.15.37
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.15.36.tar.bz2
+Source0: yast2-installation-2.15.37.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-country yast2-devtools yast2-testsuite
# Mode::live_installation
@@ -30,8 +30,8 @@
# Language::selection_skipped, bugzilla #223258
Requires: yast2-country >= 2.15.0
Requires: yast2-network >= 2.15.37
-# inst_productsources client moved to...
-Requires: yast2-packager >= 2.15.45
+# .anyxml SCR agent
+Requires: yast2-packager >= 2.15.51
# Only in inst-sys
# Requires: yast2-add-on
# Requires: yast2-mouse
@@ -71,12 +71,12 @@
BuildArchitectures: noarch
Summary: YaST2 - Installation Parts
%package devel-doc
-Version: 2.15.36
+Version: 2.15.37
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.15.36.tar.bz2
+Source0: yast2-installation-2.15.37.tar.bz2
prefix: /usr
Requires: yast2-installation >= 2.15.34
PreReq: %fillup_prereq
@@ -112,7 +112,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-installation-2.15.36
+%setup -n yast2-installation-2.15.37
%build
%{prefix}/bin/y2tool y2autoconf
@@ -186,12 +186,20 @@
%exclude %{prefix}/share/doc/packages/yast2-installation/README
%changelog
+* Mon Jul 30 2007 - locilka@suse.cz
+- Added inst_upgrade_urls client which offers URLs used on the
+ system to be used during the upgrade as well (FATE #301785).
+- Calling the client from control file.
+- Adjusted RPM dependencies (.anyxml SCR agent).
+- 2.15.37
+* Sun Jul 29 2007 - locilka@suse.cz
+- Fixed curl parameters for network test in first stage (#295484).
* Thu Jul 26 2007 - mzugec@suse.cz
- set variables VNC and USE_SSH in S07-medium (#294485)
- 2.15.36
* Wed Jul 25 2007 - mvidner@suse.cz
- startup scripts: Call initviocons only if it exists (#173426).
-- 2.13.35
+- 2.15.35
* Wed Jul 25 2007 - locilka@suse.cz
- Renamed yast2-installation-doc to yast2-installation-devel-doc
(FATE #302461).
++++++ yast2-installation-2.15.36.tar.bz2 -> yast2-installation-2.15.37.tar.bz2 ++++++
++++ 2742 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.15.36/control/control.xml new/yast2-installation-2.15.37/control/control.xml
--- old/yast2-installation-2.15.36/control/control.xml 2007-05-26 23:45:40.000000000 +0200
+++ new/yast2-installation-2.15.37/control/control.xml 2007-07-30 13:05:03.000000000 +0200
@@ -354,9 +354,14 @@
yes
</module>
<module>
+ <name>upgrade_urls</name>
+ yes
+ yes
+ </module>
+ <module>
<label>Add-On Products</label>
<name>add-on</name>
- no
+ yes
yes
</module>
<module>
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.15.36/control/docs/control-doc.xml new/yast2-installation-2.15.37/control/docs/control-doc.xml
--- old/yast2-installation-2.15.36/control/docs/control-doc.xml 2006-12-11 13:21:19.000000000 +0100
+++ new/yast2-installation-2.15.37/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 (St, 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.15.36/src/clients/inst_network_setup.ycp new/yast2-installation-2.15.37/src/clients/inst_network_setup.ycp
--- old/yast2-installation-2.15.36/src/clients/inst_network_setup.ycp 2007-07-26 17:26:59.000000000 +0200
+++ new/yast2-installation-2.15.37/src/clients/inst_network_setup.ycp 2007-07-30 12:00:42.000000000 +0200
@@ -1127,7 +1127,10 @@
"http://www.opensuse.org",
"http://www.suse.com"
], {
- string cmd = sformat ("curl --header --max-time=45 --connect-timeout=30 '%1' 1>/dev/null", String::Quote (www_address));
+ string cmd = sformat (
+ "curl --silent --show-error --max-time 45 --connect-timeout 30 '%1' 1>/dev/null",
+ String::Quote (www_address)
+ );
map run_cmd = (map) SCR::Execute (.target.bash_output, cmd);
y2milestone ("Running %1 returned %2", cmd, run_cmd);
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.15.36/src/clients/inst_upgrade_urls.ycp new/yast2-installation-2.15.37/src/clients/inst_upgrade_urls.ycp
--- old/yast2-installation-2.15.36/src/clients/inst_upgrade_urls.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-2.15.37/src/clients/inst_upgrade_urls.ycp 2007-07-30 12:38:03.000000000 +0200
@@ -0,0 +1,510 @@
+{
+ // FATE #301785: Distribution upgrade should offer
+ // existing extra installation sources as Add-On
+
+ import "Installation";
+ import "FileUtils";
+ import "Stage";
+ import "GetInstArgs";
+ import "FileUtils";
+ import "Mode";
+ import "Wizard";
+ import "Progress";
+ import "Label";
+ import "NetworkService";
+ import "Popup";
+ import "AddOnProduct";
+
+ textdomain "installation";
+
+ symbol ret = `next;
+ if (GetInstArgs::going_back()) ret = `back;
+
+ // --> Comment this out in case of testing on a running system
+ if (! Stage::initial()) {
+ y2milestone ("Not an initial stage");
+ return ret;
+ }
+ if (! Mode::update()) {
+ y2milestone ("Not an udpate mode");
+ return ret;
+ }
+ // <--
+
+ string dir_old = sformat ("%1/var/lib/zypp/db/sources/", Installation::destdir);
+ list