Hello community, here is the log from the commit of package yast2-installation checked in at Wed May 31 18:27:22 CEST 2006. -------- --- yast2-installation/yast2-installation.changes 2006-05-26 14:45:39.000000000 +0200 +++ yast2-installation/yast2-installation.changes 2006-05-31 13:56:09.000000000 +0200 @@ -1,0 +2,13 @@ +Wed May 31 12:58:33 CEST 2006 - jsrain@suse.cz + +- avoid calling Pkg::SourceStartCache during 1st stage of the + installation (#178007) +- 2.13.117 + +------------------------------------------------------------------- +Tue May 30 18:02:54 CEST 2006 - jdsn@suse.de + +- set correct title of installation step Customer Center (#179921) +- 2.13.116 + +------------------------------------------------------------------- Old: ---- yast2-installation-2.13.115.tar.bz2 New: ---- yast2-installation-2.13.117.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.zJVl9U/_old 2006-05-31 18:26:12.000000000 +0200 +++ /var/tmp/diff_new_pack.zJVl9U/_new 2006-05-31 18:26:12.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.13.115) +# spec file for package yast2-installation (Version 2.13.117) # # 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.13.115 +Version: 2.13.117 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.13.115.tar.bz2 +Source0: yast2-installation-2.13.117.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-testsuite Requires: yast2 yast2-update @@ -48,7 +48,7 @@ Arvin Schnell <arvin@suse.de> %prep -%setup -n yast2-installation-2.13.115 +%setup -n yast2-installation-2.13.117 %build %{prefix}/bin/y2tool y2autoconf @@ -111,6 +111,13 @@ /usr/X11R6/share/fvwm/ %changelog -n yast2-installation +* Wed May 31 2006 - jsrain@suse.cz +- avoid calling Pkg::SourceStartCache during 1st stage of the + installation (#178007) +- 2.13.117 +* Tue May 30 2006 - jdsn@suse.de +- set correct title of installation step Customer Center (#179921) +- 2.13.116 * Fri May 26 2006 - jsrain@suse.cz - fixed behavior if SLP source detection fails (#179036) - 2.13.115 ++++++ yast2-installation-2.13.115.tar.bz2 -> yast2-installation-2.13.117.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.115/VERSION new/yast2-installation-2.13.117/VERSION --- old/yast2-installation-2.13.115/VERSION 2006-05-26 14:29:20.000000000 +0200 +++ new/yast2-installation-2.13.117/VERSION 2006-05-31 13:06:44.000000000 +0200 @@ -1 +1 @@ -2.13.115 +2.13.117 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.115/configure new/yast2-installation-2.13.117/configure --- old/yast2-installation-2.13.115/configure 2006-05-26 14:43:01.000000000 +0200 +++ new/yast2-installation-2.13.117/configure 2006-05-31 13:54:21.000000000 +0200 @@ -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.13.115. +# Generated by GNU Autoconf 2.59 for yast2-installation 2.13.117. # # 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.13.115' -PACKAGE_STRING='yast2-installation 2.13.115' +PACKAGE_VERSION='2.13.117' +PACKAGE_STRING='yast2-installation 2.13.117' 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.13.115 to adapt to many kinds of systems. +\`configure' configures yast2-installation 2.13.117 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.13.115:";; + short | recursive ) echo "Configuration of yast2-installation 2.13.117:";; 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.13.115 +yast2-installation configure 2.13.117 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.13.115, which was +It was created by yast2-installation $as_me 2.13.117, 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.13.115' + VERSION='2.13.117' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.115" +VERSION="2.13.117" RPMNAME="yast2-installation" MAINTAINER="Jiri Srain <jsrain@suse.cz>" @@ -2906,7 +2906,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-installation $as_me 2.13.115, which was +This file was extended by yast2-installation $as_me 2.13.117, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2961,7 +2961,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-installation config.status 2.13.115 +yast2-installation config.status 2.13.117 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.13.115/configure.in new/yast2-installation-2.13.117/configure.in --- old/yast2-installation-2.13.115/configure.in 2006-05-26 14:42:49.000000000 +0200 +++ new/yast2-installation-2.13.117/configure.in 2006-05-31 13:54:15.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.13.115, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 2.13.117, 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.13.115" +VERSION="2.13.117" RPMNAME="yast2-installation" MAINTAINER="Jiri Srain <jsrain@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.115/control.pot new/yast2-installation-2.13.117/control.pot --- old/yast2-installation-2.13.115/control.pot 2006-05-24 15:14:53.000000000 +0200 +++ new/yast2-installation-2.13.117/control.pot 2006-05-30 15:49:36.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-24 15:14+0200\n" +"POT-Creation-Date: 2006-05-30 15:49+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -16,11 +16,11 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: control/control.PROF.glade:63 control/control.glade:64 +#: control/control.PROF.glade:63 msgid "" "\n" "<p><b>Congratulations!</b></p>\n" -"<p>The installation of &product; on your machine is complete.\n" +"<p>The installation of SUSE Linux on your machine is complete.\n" "After clicking <b>Finish</b>, you can log in to the system.</p>\n" "<p>Visit us at %1.</p>\n" "<p>Have a lot of fun!<br>Your SUSE Development Team</p>\n" @@ -365,3 +365,14 @@ #: control/control.SLES.glade:763 msgid "Service" msgstr "" + +#: control/control.glade:64 +msgid "" +"\n" +"<p><b>Congratulations!</b></p>\n" +"<p>The installation of &product; on your machine is complete.\n" +"After clicking <b>Finish</b>, you can log in to the system.</p>\n" +"<p>Visit us at %1.</p>\n" +"<p>Have a lot of fun!<br>Your SUSE Development Team</p>\n" +"\t" +msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.115/installation.pot new/yast2-installation-2.13.117/installation.pot --- old/yast2-installation-2.13.115/installation.pot 2006-05-24 15:14:54.000000000 +0200 +++ new/yast2-installation-2.13.117/installation.pot 2006-05-30 15:49:36.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-24 15:14+0200\n" +"POT-Creation-Date: 2006-05-30 15:49+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -254,8 +254,8 @@ #. placeholder for unknown path #. placeholder for unknown URL #: src/clients/add-on_proposal.ycp:27 src/clients/add-on_proposal.ycp:31 -#: src/include/add-on-workflow.ycp:416 src/include/add-on-workflow.ycp:421 -#: src/include/add-on-workflow.ycp:809 src/include/add-on-workflow.ycp:815 +#: src/include/add-on-workflow.ycp:417 src/include/add-on-workflow.ycp:422 +#: src/include/add-on-workflow.ycp:810 src/include/add-on-workflow.ycp:816 msgid "Unknown" msgstr "" @@ -297,7 +297,7 @@ #. feedback heading #. main screen heading #: src/clients/inst_addon_update_sources.ycp:51 -#: src/include/add-on-workflow.ycp:802 +#: src/include/add-on-workflow.ycp:803 msgid "Add-On Product Installation" msgstr "" @@ -1144,7 +1144,7 @@ #. } #. dialog caption -#: src/clients/installation.ycp:140 src/modules/AddOnProduct.ycp:920 +#: src/clients/installation.ycp:140 src/modules/AddOnProduct.ycp:923 msgid "Initializing..." msgstr "" @@ -1581,42 +1581,42 @@ #. { #. yes-no popup #. popup question -#: src/include/add-on-workflow.ycp:275 src/include/add-on-workflow.ycp:454 -#: src/include/add-on-workflow.ycp:667 src/modules/AddOnProduct.ycp:815 +#: src/include/add-on-workflow.ycp:275 src/include/add-on-workflow.ycp:455 +#: src/include/add-on-workflow.ycp:668 src/modules/AddOnProduct.ycp:815 msgid "Really abort add-on product installation?" msgstr "" -#: src/include/add-on-workflow.ycp:318 +#: src/include/add-on-workflow.ycp:319 msgid "Insert the add-on product CD" msgstr "" -#: src/include/add-on-workflow.ycp:326 +#: src/include/add-on-workflow.ycp:327 msgid "Insert the add-on product DVD" msgstr "" #. error report -#: src/include/add-on-workflow.ycp:369 +#: src/include/add-on-workflow.ycp:370 msgid "No catalog found on medium." msgstr "" #. error report -#: src/include/add-on-workflow.ycp:393 src/include/add-on-workflow.ycp:501 +#: src/include/add-on-workflow.ycp:394 src/include/add-on-workflow.ycp:502 msgid "Failed to initialize the catalog." msgstr "" #. table cell, %1 is URL, %2 is directory name -#: src/include/add-on-workflow.ycp:419 src/include/add-on-workflow.ycp:813 +#: src/include/add-on-workflow.ycp:420 src/include/add-on-workflow.ycp:814 #, ycp-format msgid "URL: %1, Directory: %2" msgstr "" #. dialog caption -#: src/include/add-on-workflow.ycp:425 +#: src/include/add-on-workflow.ycp:426 msgid "Catalog Selection" msgstr "" #. help text -#: src/include/add-on-workflow.ycp:427 +#: src/include/add-on-workflow.ycp:428 msgid "" "<p><big><b>Catalog Selection</b></big><br>\n" "There were multiple catalogs found on the selected medium.\n" @@ -1624,39 +1624,39 @@ msgstr "" #. popup message -#: src/include/add-on-workflow.ycp:470 +#: src/include/add-on-workflow.ycp:471 msgid "Select a catalog." msgstr "" #. table cell -#: src/include/add-on-workflow.ycp:541 +#: src/include/add-on-workflow.ycp:542 msgid "No product found in the catalog" msgstr "" #. message popup -#: src/include/add-on-workflow.ycp:573 +#: src/include/add-on-workflow.ycp:574 msgid "" "The product on the media is already installed\n" "or selected for installation." msgstr "" #. message popup -#: src/include/add-on-workflow.ycp:596 +#: src/include/add-on-workflow.ycp:597 msgid "Dependencies of the add-on product cannot be fullfilled." msgstr "" #. dialog caption -#: src/include/add-on-workflow.ycp:640 +#: src/include/add-on-workflow.ycp:641 msgid "Product Selection" msgstr "" #. multi selection list -#: src/include/add-on-workflow.ycp:644 +#: src/include/add-on-workflow.ycp:645 msgid "Available Products" msgstr "" #. help text -#: src/include/add-on-workflow.ycp:648 +#: src/include/add-on-workflow.ycp:649 msgid "" "<p><b><big>Product Selection</big></b><br>\n" "There were multiple products found in the catalog. Select the products\n" @@ -1664,39 +1664,39 @@ msgstr "" #. message popup -#: src/include/add-on-workflow.ycp:709 +#: src/include/add-on-workflow.ycp:710 msgid "Dependencies of the selected add-on products cannot be fullfilled." msgstr "" -#: src/include/add-on-workflow.ycp:818 +#: src/include/add-on-workflow.ycp:819 #, ycp-format msgid "Product %1" msgstr "" #. table header -#: src/include/add-on-workflow.ycp:823 +#: src/include/add-on-workflow.ycp:824 msgid "Media" msgstr "" #. table header -#: src/include/add-on-workflow.ycp:825 +#: src/include/add-on-workflow.ycp:826 msgid "Product" msgstr "" #. message report -#: src/include/add-on-workflow.ycp:854 +#: src/include/add-on-workflow.ycp:855 msgid "Select a product to delete." msgstr "" #. popup error #. error report #: src/modules/AddOnProduct.ycp:769 src/modules/AddOnProduct.ycp:790 -#: src/modules/AddOnProduct.ycp:897 +#: src/modules/AddOnProduct.ycp:900 msgid "An error occurred while preparing the installation system." msgstr "" #. error report -#: src/modules/AddOnProduct.ycp:912 +#: src/modules/AddOnProduct.ycp:915 #, ycp-format msgid "Control file %1 not found on media." msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.115/src/clients/release_notes_popup.ycp new/yast2-installation-2.13.117/src/clients/release_notes_popup.ycp --- old/yast2-installation-2.13.115/src/clients/release_notes_popup.ycp 2006-04-13 16:53:06.000000000 +0200 +++ new/yast2-installation-2.13.117/src/clients/release_notes_popup.ycp 2006-05-31 13:05:08.000000000 +0200 @@ -6,7 +6,7 @@ * * Display release notes. * - * $Id: release_notes_popup.ycp 30094 2006-04-13 08:39:41Z mvidner $ + * $Id: release_notes_popup.ycp 31205 2006-05-31 11:05:00Z jsrain $ */ { @@ -15,6 +15,8 @@ import "Language"; import "Report"; import "Label"; + import "Stage"; + import "Packages"; /* filename of release notes */ string file = ""; @@ -27,8 +29,16 @@ define boolean load_release_notes () { string path_to_relnotes = "/docu"; - list<integer> sources = Pkg::SourceStartCache (true); - integer source_id = sources[0]:0; + integer source_id = 0; + if (Stage::initial ()) + { + source_id = Packages::theSources[0]:0; + } + else + { + list<integer> sources = Pkg::SourceStartCache (true); + source_id = sources[0]:0; + } string path_templ = path_to_relnotes + "/RELEASE-NOTES.%1.rtf"; y2debug ("Path template: %1", path_templ); string tmp = sformat (path_templ, Language::language); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...