Hello community, here is the log from the commit of package yast2-instserver checked in at Fri May 19 16:51:24 CEST 2006. -------- --- yast2-instserver/yast2-instserver.changes 2006-05-12 13:33:33.000000000 +0200 +++ yast2-instserver/yast2-instserver.changes 2006-05-19 07:59:24.000000000 +0200 @@ -1,0 +2,17 @@ +Thu May 18 14:03:20 CEST 2006 - lslezak@suse.cz + +- ask for an add-on product only if the product is pre-CODE10 + (#170729) +- don't touch MD5SUMS file in setup/descr subdir (SHA1 sum is in + signed content file, it could potentionally break signed sources) +- don't recreate MD5SUMS for standalone products +- read content file from CD1 only once (required for SLES9, there + is CORE9 CD1) +- 2.13.9 + +------------------------------------------------------------------- +Tue May 16 16:00:46 CEST 2006 - jsuchome@suse.cz + +- recreate MD5SUMS files after copying CDs (#175040) + +------------------------------------------------------------------- Old: ---- yast2-instserver-2.13.8.tar.bz2 New: ---- yast2-instserver-2.13.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-instserver.spec ++++++ --- /var/tmp/diff_new_pack.aC6hHQ/_old 2006-05-19 16:51:19.000000000 +0200 +++ /var/tmp/diff_new_pack.aC6hHQ/_new 2006-05-19 16:51:19.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-instserver (Version 2.13.8) +# spec file for package yast2-instserver (Version 2.13.9) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-instserver URL: http://www.suse.com/ -Version: 2.13.8 +Version: 2.13.9 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-instserver-2.13.8.tar.bz2 +Source0: yast2-instserver-2.13.9.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-slp yast2-testsuite Requires: yast2, yast2-slp @@ -37,7 +37,7 @@ Anas Nashif <nashif@suse.de> %prep -%setup -n yast2-instserver-2.13.8 +%setup -n yast2-instserver-2.13.9 %build %{prefix}/bin/y2tool y2autoconf @@ -76,6 +76,17 @@ %dir /etc/apache2/conf.d %changelog -n yast2-instserver +* Thu May 18 2006 - lslezak@suse.cz +- ask for an add-on product only if the product is pre-CODE10 + (#170729) +- don't touch MD5SUMS file in setup/descr subdir (SHA1 sum is in + signed content file, it could potentionally break signed sources) +- don't recreate MD5SUMS for standalone products +- read content file from CD1 only once (required for SLES9, there + is CORE9 CD1) +- 2.13.9 +* Tue May 16 2006 - jsuchome@suse.cz +- recreate MD5SUMS files after copying CDs (#175040) * Fri May 12 2006 - jsuchome@suse.cz - when creating installation source, use the content file from first CD and create actual directory.yast (#171157) ++++++ yast2-instserver-2.13.8.tar.bz2 -> yast2-instserver-2.13.9.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.13.8/VERSION new/yast2-instserver-2.13.9/VERSION --- old/yast2-instserver-2.13.8/VERSION 2006-05-12 12:45:15.000000000 +0200 +++ new/yast2-instserver-2.13.9/VERSION 2006-05-18 06:55:13.000000000 +0200 @@ -1 +1 @@ -2.13.8 +2.13.9 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.13.8/configure new/yast2-instserver-2.13.9/configure --- old/yast2-instserver-2.13.8/configure 2006-05-11 10:27:15.000000000 +0200 +++ new/yast2-instserver-2.13.9/configure 2006-05-19 07:50:39.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-instserver 2.13.7. +# Generated by GNU Autoconf 2.59 for yast2-instserver 2.13.9. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2-instserver' PACKAGE_TARNAME='yast2-instserver' -PACKAGE_VERSION='2.13.7' -PACKAGE_STRING='yast2-instserver 2.13.7' +PACKAGE_VERSION='2.13.9' +PACKAGE_STRING='yast2-instserver 2.13.9' 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-instserver 2.13.7 to adapt to many kinds of systems. +\`configure' configures yast2-instserver 2.13.9 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-instserver 2.13.7:";; + short | recursive ) echo "Configuration of yast2-instserver 2.13.9:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-instserver configure 2.13.7 +yast2-instserver configure 2.13.9 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-instserver $as_me 2.13.7, which was +It was created by yast2-instserver $as_me 2.13.9, 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-instserver' - VERSION='2.13.7' + VERSION='2.13.9' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.7" +VERSION="2.13.9" RPMNAME="yast2-instserver" MAINTAINER="Ladislav Slezak <lslezak@suse.cz>" @@ -2693,7 +2693,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-instserver $as_me 2.13.7, which was +This file was extended by yast2-instserver $as_me 2.13.9, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2748,7 +2748,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-instserver config.status 2.13.7 +yast2-instserver config.status 2.13.9 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-instserver-2.13.8/configure.in new/yast2-instserver-2.13.9/configure.in --- old/yast2-instserver-2.13.8/configure.in 2006-05-11 10:27:10.000000000 +0200 +++ new/yast2-instserver-2.13.9/configure.in 2006-05-19 07:50:34.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-instserver, 2.13.7, http://bugs.opensuse.org/, yast2-instserver) +AC_INIT(yast2-instserver, 2.13.9, http://bugs.opensuse.org/, yast2-instserver) 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.7" +VERSION="2.13.9" RPMNAME="yast2-instserver" MAINTAINER="Ladislav Slezak <lslezak@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.13.8/instserver.pot new/yast2-instserver-2.13.9/instserver.pot --- old/yast2-instserver-2.13.8/instserver.pot 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-instserver-2.13.9/instserver.pot 2005-10-18 10:53:37.000000000 +0200 @@ -0,0 +1,582 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-10-18 10:53+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" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: src/Instserver.ycp:281 +msgid "" +"The FTP installation server requires an FTP server package. The vsftpd package\n" +"will now be installed.\n" +msgstr "" + +#: src/Instserver.ycp:381 +msgid "Unable to write /etc/sysconfig/apache2" +msgstr "" + +#: src/Instserver.ycp:395 +msgid "" +"The HTTP installation server requires an HTTP server package. The apache2 package\n" +"will now be installed." +msgstr "" + +#. Instserver read dialog caption +#: src/Instserver.ycp:642 +msgid "Initializing Configuration" +msgstr "" + +#. Progress stage 1/2 +#: src/Instserver.ycp:652 +msgid "Read configuration file" +msgstr "" + +#. Progress stage 2/2 +#: src/Instserver.ycp:654 +msgid "Look for new source media" +msgstr "" + +#. Progress step 1/2 +#: src/Instserver.ycp:657 +msgid "Reading configuration file..." +msgstr "" + +#. Progress step 2/2 +#: src/Instserver.ycp:659 +msgid "Looking for new source media..." +msgstr "" + +#. Progress finished +#: src/Instserver.ycp:661 src/Instserver.ycp:758 +msgid "Finished" +msgstr "" + +#. Error message +#: src/Instserver.ycp:701 +msgid "Cannot read current settings." +msgstr "" + +#. Instserver read dialog caption +#: src/Instserver.ycp:739 +msgid "Saving Installation Server Configuration" +msgstr "" + +#. Progress stage 1/2 +#: src/Instserver.ycp:749 +msgid "Write the settings" +msgstr "" + +#. Progress stage 2/2 +#: src/Instserver.ycp:751 +msgid "Run SuSEconfig" +msgstr "" + +#. Progress step 1/2 +#: src/Instserver.ycp:754 +msgid "Writing the settings..." +msgstr "" + +#. Progress step 2/2 +#: src/Instserver.ycp:756 +msgid "Running SuSEconfig..." +msgstr "" + +#. Error message +#: src/Instserver.ycp:772 +msgid "Cannot write settings." +msgstr "" + +#: src/Instserver.ycp:837 +msgid "Error while moving installation source content." +msgstr "" + +#: src/Instserver.ycp:942 +msgid "Configured Sources" +msgstr "" + +#. source overview - %1 is product name (e.g. "SUSE LINUX Version 10.0") +#: src/complex.ycp:81 +#, ycp-format +msgid "Label: %1" +msgstr "" + +#. yes/no string displayed in the overview +#: src/complex.ycp:87 +#, ycp-format +msgid "Announce using SLP: %1" +msgstr "" + +#: src/complex.ycp:87 +msgid "Yes" +msgstr "" + +#: src/complex.ycp:87 +msgid "No" +msgstr "" + +#. Instserver overview dialog caption +#: src/complex.ycp:111 +msgid "Installation Server" +msgstr "" + +#. menu item +#: src/complex.ycp:114 +msgid "&Server configuration..." +msgstr "" + +#. table header +#: src/complex.ycp:121 +msgid "Configuration" +msgstr "" + +#: src/complex.ycp:121 +msgid "Product" +msgstr "" + +#: src/dialogs.ycp:48 +msgid "Change Media" +msgstr "" + +#: src/dialogs.ycp:51 +msgid "Ski&p" +msgstr "" + +#: src/dialogs.ycp:129 +#, ycp-format +msgid "Insert CD %1 then press continue." +msgstr "" + +#: src/dialogs.ycp:131 +#, ycp-format +msgid "Select ISO image %1 then press continue." +msgstr "" + +#. %2 is the product name and version +#: src/dialogs.ycp:136 +#, ycp-format +msgid "Insert CD %1 of %2." +msgstr "" + +#: src/dialogs.ycp:137 +#, ycp-format +msgid "Select ISO image %1 of %2." +msgstr "" + +#. add-on medium (e.g. service pack) doesn't match configured source +#: src/dialogs.ycp:360 +#, ycp-format +msgid "" +"The medium requires product '%1'.\n" +"The configured installation source provides product '%2'.\n" +"\n" +"Select the right add-on product." +msgstr "" + +#: src/dialogs.ycp:441 +msgid "Copying CD contents to local directory" +msgstr "" + +#: src/dialogs.ycp:441 +msgid "This may take a while..." +msgstr "" + +#. Instserver configuration dialog caption +#: src/dialogs.ycp:552 src/dialogs.ycp:715 +msgid "Source Configuration" +msgstr "" + +#: src/dialogs.ycp:564 +msgid "Read &CD/DVD Medium" +msgstr "" + +#: src/dialogs.ycp:567 +msgid "Data &source" +msgstr "" + +#: src/dialogs.ycp:571 +msgid "Use &ISO Images" +msgstr "" + +#: src/dialogs.ycp:577 +msgid "Di&rectory with CD Images:" +msgstr "" + +#: src/dialogs.ycp:580 src/dialogs.ycp:845 +msgid "Select &Directory" +msgstr "" + +#: src/dialogs.ycp:621 src/dialogs.ycp:905 +msgid "Select Directory" +msgstr "" + +#: src/dialogs.ycp:636 src/dialogs.ycp:756 +msgid "Installation server name missing." +msgstr "" + +#: src/dialogs.ycp:647 +msgid "" +"Contents already exist in this directory.\n" +"Not copying CDs." +msgstr "" + +#. for translators: popup question (prefer more shorter lines than few long lines) +#: src/dialogs.ycp:657 +msgid "" +"Add an additional product (Service Pack, Additional\n" +"Package CD, etc.) to the source?" +msgstr "" + +#: src/dialogs.ycp:724 +msgid "Source &Name:" +msgstr "" + +#: src/dialogs.ycp:727 +msgid "A&nnounce as Installation Service with SLP" +msgstr "" + +#: src/dialogs.ycp:764 +msgid "Invalid source name." +msgstr "" + +#. an error message - entered source name already exists +#: src/dialogs.ycp:770 +#, ycp-format +msgid "" +"Source '%1' already exists,\n" +"enter another name." +msgstr "" + +#: src/dialogs.ycp:780 +#, ycp-format +msgid "" +"Error while creating 'source' directory.\n" +"Verify that the directory \n" +" %1 \n" +"is writable and try again." +msgstr "" + +#. Instserver server dialog caption +#: src/dialogs.ycp:829 +msgid "Initial Setup -- Servers" +msgstr "" + +#: src/dialogs.ycp:838 +msgid "Do Not Configure Any Net&work Services" +msgstr "" + +#: src/dialogs.ycp:841 +msgid "Di&rectory to Contain Sources:" +msgstr "" + +#: src/dialogs.ycp:856 +msgid "&Configure as HTTP Source" +msgstr "" + +#: src/dialogs.ycp:859 +msgid "&Configure as FTP Source" +msgstr "" + +#: src/dialogs.ycp:862 +msgid "&Configure as NFS Source" +msgstr "" + +#: src/dialogs.ycp:921 +msgid "Directory path for the installation server missing." +msgstr "" + +#. Instserver configure2 dialog caption +#: src/dialogs.ycp:950 +msgid "Installation Server -- NFS" +msgstr "" + +#: src/dialogs.ycp:959 +msgid "&Host Wild Card" +msgstr "" + +#: src/dialogs.ycp:960 +msgid "&Options" +msgstr "" + +#: src/dialogs.ycp:990 +msgid "Error occurred while configuring NFS." +msgstr "" + +#. Instserver configure2 dialog caption +#: src/dialogs.ycp:1014 +msgid "Installation Server -- FTP" +msgstr "" + +#: src/dialogs.ycp:1022 +msgid "&FTP Server Root Directory:" +msgstr "" + +#: src/dialogs.ycp:1023 +msgid "&Directory Alias:" +msgstr "" + +#: src/dialogs.ycp:1056 +msgid "Error occurred while configuring FTP." +msgstr "" + +#. Instserver configure2 dialog caption +#: src/dialogs.ycp:1080 +msgid "Installation Server -- HTTP" +msgstr "" + +#: src/dialogs.ycp:1087 +msgid "&Directory Alias" +msgstr "" + +#: src/dialogs.ycp:1115 +msgid "Error creating HTTPD configuration." +msgstr "" + +#: src/helps.ycp:20 +msgid "" +"<p><b><big>Network Server Configuration</big></b><br>\n" +"</p>" +msgstr "" + +#: src/helps.ycp:23 +msgid "" +"<p>Select one of the server options and specify where all the sources\n" +"should be hosted on the local system.\n" +"</p>" +msgstr "" + +#: src/helps.ycp:26 +msgid "" +"<p>If you have one of the services already running and want to do the\n" +"server configuration manually, select not to configure \n" +"the services.\n" +"</p>\n" +msgstr "" + +#: src/helps.ycp:31 +msgid "" +"<p><b><big>NFS Server Configuration</big></b><br>\n" +"</p>" +msgstr "" + +#: src/helps.ycp:34 +msgid "" +"<p>To complete this configuration, a new entry in the file\n" +"<em>/etc/exports</em> must be added and the NFS server must be \n" +"installed and started.\n" +"</p>\n" +msgstr "" + +#: src/helps.ycp:40 +msgid "" +"<p>If you need to restrict access to the exported directories to certain \n" +"hosts, add a more restrictive wild card mask. For example, use <em>192.168.1.0/24</em>\n" +"to restrict access to the <em>192.168.1.0</em> subnet.\n" +"</p>\n" +msgstr "" + +#: src/helps.ycp:45 +msgid "" +"<p>Additionally, set the export options. For more details about the available\n" +"options, see the manual page for <em>exports</em> (man exports(5))\n" +"</p>\n" +msgstr "" + +#: src/helps.ycp:50 +msgid "" +"<p>The source will be available at the following URL:\n" +"<tt>nfs://Host_IP/Source_Name</tt></p>" +msgstr "" + +#: src/helps.ycp:52 +msgid "" +"<p><b><big>FTP Server Configuration</big></b><br>\n" +"</p>" +msgstr "" + +#: src/helps.ycp:55 +msgid "" +"<p>To complete this configuration, an FTP server must be \n" +"installed and started.</p>\n" +msgstr "" + +#: src/helps.ycp:59 +msgid "" +"<p>If the installation server directory chosen is outside\n" +"the FTP server hierarchy, a mount entry is added to <em>/etc/fstab</em>,\n" +"which makes the Installation Server directory available under the\n" +"FTP server (using the <em>--bind</em> option of <em>mount</em>).\n" +"</p>\n" +msgstr "" + +#: src/helps.ycp:66 +msgid "" +"<p>The installation server will be available to clients using the following URL:\n" +"</p>\n" +msgstr "" + +#: src/helps.ycp:70 +msgid "" +"<p><tt>ftp://<Host IP>/<Source Name></tt>\n" +"</p>" +msgstr "" + +#: src/helps.ycp:72 +msgid "" +"<p><b><big>HTTP Server Configuration</big></b><br>\n" +"</p>" +msgstr "" + +#: src/helps.ycp:75 +msgid "" +"<p>To complete this configuration, an HTTP server must be \n" +"installed and started. The alias will be used to reference the installation\n" +"server root directory.</p>\n" +msgstr "" + +#: src/helps.ycp:80 +msgid "" +"<p>Select a short and easy to remember alias. For example, if you select\n" +"<em>SuSE</em> as the alias, the sources will be available as shown below:</p>\n" +msgstr "" + +#: src/helps.ycp:84 +msgid "" +"<p><tt>http://<Host IP>/SuSE/<Source Name></tt>\n" +"</p>" +msgstr "" + +#: src/helps.ycp:87 src/helps.ycp:106 +msgid "" +"<p><b><big>Creating a New Configuration</big></b><br>\n" +"</p>\n" +msgstr "" + +#: src/helps.ycp:90 +msgid "" +"<p>To create a new installation server using the configured\n" +"protocol (NFS, FTP, or HTTP), select a name for the installation server (or source). \n" +"This name will be used to create a directory under which all product CDs are copied\n" +"and managed.</p> \n" +msgstr "" + +#: src/helps.ycp:95 src/helps.ycp:113 +msgid "" +"<p>You can let YaST prompt you for additional CDs if those should be copied \n" +"after the main CDs have been copied, for example, Service Pack CDs or any \n" +"additional add-on CDs,</p>\n" +msgstr "" + +#: src/helps.ycp:100 +msgid "<p><b><big>SLP Support</big></b></p>" +msgstr "" + +#: src/helps.ycp:102 +msgid "" +"<p>SLP (Service Location Protocol) makes finding an installation server easier. \n" +"If checked, the installation server will be announced on the network using SLP.</p>\n" +msgstr "" + +#: src/helps.ycp:110 +msgid "" +"<p>Select a source drive from the list, insert the first medium and press\n" +"<b>Next</b> to copy the content into the local repository.</p>" +msgstr "" + +#: src/helps.ycp:118 +msgid "<p><b><big>ISO Images</big></b></p>" +msgstr "" + +#: src/helps.ycp:120 +msgid "" +"<p>ISO images can be used instead of CD/DVD media. Press <b>Next</b> and\n" +"then select ISO image file of the first medium in the popup dialog.</p>" +msgstr "" + +#. Read dialog help 1/2 +#: src/helps.ycp:125 +msgid "" +"<p><b><big>Initializing Configuration</big></b><br>\n" +"Please wait...<br></p>\n" +msgstr "" + +#. Read dialog help 2/2 +#: src/helps.ycp:130 +msgid "" +"<p><b><big>Aborting Initialization:</big></b><br>\n" +"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>\n" +msgstr "" + +#. Write dialog help 1/2 +#: src/helps.ycp:135 +msgid "" +"<p><b><big>Saving Source Configuration</big></b><br>\n" +"Please wait...<br></p>\n" +msgstr "" + +#. Write dialog help 2/2 +#: src/helps.ycp:140 +msgid "" +"<p><b><big>Aborting Saving:</big></b><br>\n" +"Abort the save procedure by pressing <b>Abort</b>.\n" +"An additional dialog informs whether it is safe to do so.\n" +"</p>\n" +msgstr "" + +#. Summary dialog help 1/3 +#: src/helps.ycp:147 +msgid "" +"<p><b><big>Installation Server Configuration</big></b><br>\n" +"Configure the installation server here.<br></p>\n" +msgstr "" + +#. Summary dialog help 2/3 +#: src/helps.ycp:152 +msgid "" +"<p><b><big>Adding an Installation Server:</big></b><br>\n" +"YaST searches for unconfigured directories inside \n" +"the source repository and makes them available for configuration.\n" +"Choose a source from the list of found sources. \n" +"Then press <b>Configure</b>.</p>\n" +msgstr "" + +#. Summary dialog help 3/3 +#: src/helps.ycp:160 +msgid "" +"<p><b><big>Editing or Deleting:</big></b><br>\n" +"If you press <b>Edit</b>, an additional dialog in which to change\n" +"the configuration opens.</p>\n" +msgstr "" + +#. Ovreview dialog help 1/3 +#: src/helps.ycp:166 +msgid "" +"<p><b><big>Installation Server Configuration Overview</big></b><br>\n" +"Obtain an overview of installed installation servers. Additionally\n" +"edit their configuration.<br></p>\n" +msgstr "" + +#. Ovreview dialog help 2/3 +#: src/helps.ycp:172 +msgid "" +"<p><b><big>Adding an Installation Server:</big></b><br>\n" +"Press <b>Add</b> to configure an installation server.</p>" +msgstr "" + +#. Ovreview dialog help 3/3 +#: src/helps.ycp:176 +msgid "" +"<p><b><big>Editing or Deleting:</big></b><br>\n" +"Choose an installation server to change or remove.\n" +"Then press <b>Edit</b> or <b>Delete</b> as desired.</p>\n" +msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.13.8/src/dialogs.ycp new/yast2-instserver-2.13.9/src/dialogs.ycp --- old/yast2-instserver-2.13.8/src/dialogs.ycp 2006-05-11 17:30:58.000000000 +0200 +++ new/yast2-instserver-2.13.9/src/dialogs.ycp 2006-05-19 07:57:32.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Anas Nashif <nashif@suse.de> * - * $Id: dialogs.ycp 26641 2005-12-19 14:52:27Z jsuchome $ + * $Id: dialogs.ycp 31032 2006-05-19 05:57:27Z lslezak $ */ { @@ -133,6 +133,7 @@ integer current_cd = 1; integer total_cds = 1; boolean standalone = true; + boolean standalone_product = true; boolean baseproduct = false; string base = ""; string basever = ""; @@ -313,9 +314,13 @@ { content = ReadContentFile(cdpath + "/content"); y2debug("Content file: %1", content); - if (current_cd == 1) + // don't rewrite the already read content file, + // content file from CORE9 would rewrite already read file from SLES9 + if (current_cd == 1 && content_first_CD == "") { + y2milestone("Reading content file %1", cdpath + "/content"); content_first_CD = (string) SCR::Read (.target.string, cdpath + "/content"); + y2debug("content file: %1", content_first_CD); } if (media[2]:"" != "" && media[2]:"" != "doublesided") { @@ -462,6 +467,8 @@ // its not standalone standalone = false; + // remember for the finalizing + standalone_product = false; // and its not a base product baseproduct = false; @@ -630,7 +637,7 @@ if (total_cds == current_cd && !standalone && !baseproduct && !promptmore) { - y2debug("Restarting..."); + y2milestone("Restarting media counter..."); restart = true; current_cd = 1; media_id = ""; @@ -660,15 +667,36 @@ return `abort; } - if (stype == `onedir) + if (content_first_CD != "") { - y2milestone ("creating new root directory.yast...."); - if (content_first_CD != "") - { - y2milestone ("writing content file from 1st CD..."); - SCR::Write (.target.string, dir + "/content", content_first_CD); - } - SCR::Execute(.target.bash, sformat("rm -f %1/directory.yast; cd %1; ls -p | grep -v -e '^\\.$' -e '^\\.\\.$' -e 'directory.yast' > %1/directory.yast", dir)); + y2milestone ("writing content file from the 1st CD..."); + SCR::Execute (.target.remove, dir + "/content"); + SCR::Write (.target.string, dir + "/content", content_first_CD); + } + + y2milestone ("creating new root directory.yast...."); + SCR::Execute(.target.bash, sformat("rm -f %1/directory.yast; cd %1; ls -p | grep -v -e '^\\.$' -e '^\\.\\.$' -e 'directory.yast' > %1/directory.yast", dir)); + + y2milestone("standalone_product: %1", standalone_product); + if (standalone_product) + { + // recreate MD5SUM files + map out = (map) SCR::Execute(.target.bash_output, sformat ("find %1 -type f -name MD5SUMS", dir)); + foreach (string file, splitstring(out["stdout"]:"", "\n"), { + if (file != "") + { + string md5dir = substring (file,0,search(file,"/MD5SUMS")); + // don't change MD5SUMS in product description directory, + // SHA1 sum of the file is in _signed_ content file + if (md5dir == nil || md5dir == "" || issubstring(file, "/setup/descr")) return; + + SCR::Execute (.target.remove, file); + + string command = sformat("cd %1; md5sum * > MD5SUMS", md5dir); + y2milestone("Command: %1", command); + SCR::Execute (.target.bash, command, $["LANG" : "C"]); + } + }); } return `next; @@ -808,8 +836,54 @@ if (ret == `next) { + // ask for an addon only when the product is pre-CODE10 + boolean ask_for_addon = false; + + if (SCR::Read(.target.size, target + "/content") > 0) + { + map content_file = ReadContentFile(target + "/content"); + y2debug("Parsed content file: %1", content_file); + + string product_lower = tolower(content_file["PRODUCT"]:""); + string version_str = content_file["VERSION"]:""; + + y2milestone("product: %1", product_lower); + y2milestone("version: %1", version_str); + + integer version_major = 0; + integer version_minor = 0; + + if (issubstring(version_str, ".")) + { + list<string> parts = splitstring(version_str, "."); + + version_major = tointeger(parts[0]:"0"); + version_minor = tointeger(parts[1]:"0"); + } + else + { + version_major = tointeger(version_str); + } + + y2milestone("major version number: %1", version_major); + y2milestone("minor version number: %1", version_minor); + + integer version = 100 * version_major + version_minor; + y2milestone("version: %1", version); + + // SUSE Linux <= 10.0 + if ( (product_lower == "suse linux" && version <= 1000) || + // SLES or CORE == 9 + ((product_lower == "suse sles" || product_lower == "suse core") && version == 900) ) + { + ask_for_addon = true; + } + } + + y2milestone("ask_for_addon: %1", ask_for_addon); + // for translators: popup question (prefer more shorter lines than few long lines) - while (Popup::YesNo(_("Add an additional product (Service Pack, Additional\nPackage CD, etc.) to the source?")) == true) + while (ask_for_addon && Popup::YesNo(_("Add an additional product (Service Pack, Additional\nPackage CD, etc.) to the source?")) == true) { CopyCDs(target, `onedir, iso, true, selecteddrive); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root＠suse.de