Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at Fri Oct 7 00:51:00 CEST 2011.
-------- --- openSUSE:Factory/yast2-packager/yast2-packager.changes 2011-10-03 09:26:46.000000000 +0200 +++ yast2-packager/yast2-packager.changes 2011-10-06 14:16:52.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Oct 6 11:52:02 UTC 2011 - [email protected] + +- skip product selection in the second stage (do not reinstall + the product package during autoinstallation) (bnc#721166) +- 2.21.18 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-packager-2.21.17.tar.bz2 New: ---- yast2-packager-2.21.18.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.snBSKn/_old 2011-10-07 00:50:53.000000000 +0200 +++ /var/tmp/diff_new_pack.snBSKn/_new 2011-10-07 00:50:53.000000000 +0200 @@ -19,7 +19,7 @@ Name: yast2-packager -Version: 2.21.17 +Version: 2.21.18 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -28,7 +28,7 @@ Prefix: /usr Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer update-desktop-files yast2-country-data yast2-devtools yast2-slp yast2-testsuite yast2-xml # HTTP.ycp ++++++ yast2-packager-2.21.17.tar.bz2 -> yast2-packager-2.21.18.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.17/Makefile.am new/yast2-packager-2.21.18/Makefile.am --- old/yast2-packager-2.21.17/Makefile.am 2011-09-23 16:50:45.000000000 +0200 +++ new/yast2-packager-2.21.18/Makefile.am 2011-10-06 14:15:13.000000000 +0200 @@ -20,7 +20,6 @@ IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) COPYRIGHT_files_gpl = README COPYING @@ -155,7 +154,7 @@ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local +package: check-up-to-date check-tagversion check-textdomain package-local TAGVERSION = $(Y2TOOL) tagversion @@ -185,21 +184,6 @@ check-parse: @echo "Not running parseycp." -check-all-packages: - @if [ ! -e "$(ALL_PACKAGES)" ]; then \ - echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \ - fi - @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \ - fi - @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some unknown (?) fields:"; \ - echo; \ - grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \ - echo; \ - false; \ - fi - check-textdomain: $(Y2TOOL) check-textdomain $(srcdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.17/Makefile.in new/yast2-packager-2.21.18/Makefile.in --- old/yast2-packager-2.21.17/Makefile.in 2011-09-23 16:50:48.000000000 +0200 +++ new/yast2-packager-2.21.18/Makefile.in 2011-10-06 14:15:16.000000000 +0200 @@ -261,7 +261,6 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) COPYRIGHT_files_gpl = README COPYING COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ @@ -902,7 +901,7 @@ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local +package: check-up-to-date check-tagversion check-textdomain package-local check-up-to-date check-cvs-up-to-date check-svn-up-to-date: if [ -d $(srcdir)/CVS ]; then \ @@ -930,21 +929,6 @@ check-parse: @echo "Not running parseycp." -check-all-packages: - @if [ ! -e "$(ALL_PACKAGES)" ]; then \ - echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \ - fi - @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \ - fi - @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some unknown (?) fields:"; \ - echo; \ - grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \ - echo; \ - false; \ - fi - check-textdomain: $(Y2TOOL) check-textdomain $(srcdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.17/VERSION new/yast2-packager-2.21.18/VERSION --- old/yast2-packager-2.21.17/VERSION 2011-09-23 16:50:17.000000000 +0200 +++ new/yast2-packager-2.21.18/VERSION 2011-10-06 13:58:48.000000000 +0200 @@ -1 +1 @@ -2.21.17 +2.21.18 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.17/configure new/yast2-packager-2.21.18/configure --- old/yast2-packager-2.21.17/configure 2011-09-23 16:50:47.000000000 +0200 +++ new/yast2-packager-2.21.18/configure 2011-10-06 14:15:15.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2-packager 2.21.17. +# Generated by GNU Autoconf 2.68 for yast2-packager 2.21.18. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-packager' PACKAGE_TARNAME='yast2-packager' -PACKAGE_VERSION='2.21.17' -PACKAGE_STRING='yast2-packager 2.21.17' +PACKAGE_VERSION='2.21.18' +PACKAGE_STRING='yast2-packager 2.21.18' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1229,7 +1229,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-packager 2.21.17 to adapt to many kinds of systems. +\`configure' configures yast2-packager 2.21.18 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1300,7 +1300,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-packager 2.21.17:";; + short | recursive ) echo "Configuration of yast2-packager 2.21.18:";; esac cat <<\_ACEOF @@ -1380,7 +1380,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-packager configure 2.21.17 +yast2-packager configure 2.21.18 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1397,7 +1397,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-packager $as_me 2.21.17, which was +It was created by yast2-packager $as_me 2.21.18, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2327,7 +2327,7 @@ # Define the identity of the package. PACKAGE='yast2-packager' - VERSION='2.21.17' + VERSION='2.21.18' cat >>confdefs.h <<_ACEOF @@ -2449,7 +2449,7 @@ -VERSION="2.21.17" +VERSION="2.21.18" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <[email protected]>" @@ -3379,7 +3379,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-packager $as_me 2.21.17, which was +This file was extended by yast2-packager $as_me 2.21.18, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3432,7 +3432,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-packager config.status 2.21.17 +yast2-packager config.status 2.21.18 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.17/configure.in new/yast2-packager-2.21.18/configure.in --- old/yast2-packager-2.21.17/configure.in 2011-09-23 16:50:45.000000000 +0200 +++ new/yast2-packager-2.21.18/configure.in 2011-10-06 14:15:13.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-packager dnl -dnl -- This file is generated by y2autoconf 2.21.2 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.4 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.21.17, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.21.18, http://bugs.opensuse.org/, yast2-packager) 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.21.17" +VERSION="2.21.18" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.17/src/clients/install_test.ycp new/yast2-packager-2.21.18/src/clients/install_test.ycp --- old/yast2-packager-2.21.17/src/clients/install_test.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-2.21.18/src/clients/install_test.ycp 2010-01-12 11:48:56.000000000 +0100 @@ -0,0 +1,6 @@ +{ + import "Package"; + + + Package::InstallAll(["yast2-nfs-server"]); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.17/src/modules/Packages.ycp new/yast2-packager-2.21.18/src/modules/Packages.ycp --- old/yast2-packager-2.21.17/src/modules/Packages.ycp 2011-09-23 13:26:00.000000000 +0200 +++ new/yast2-packager-2.21.18/src/modules/Packages.ycp 2011-10-06 14:15:10.000000000 +0200 @@ -3,7 +3,7 @@ * Package: Package selections * Authors: Anas Nashif <[email protected]> * - * $Id: Packages.ycp 65971 2011-09-23 11:26:00Z lslezak $ + * $Id: Packages.ycp 66288 2011-10-06 12:15:54Z lslezak $ */ { @@ -1732,6 +1732,13 @@ */ global boolean SelectProduct () { Packages::Initialize (true); + + if (Stage::cont()) + { + y2milestone("Second stage - skipping product selection"); + return true; + } + list<map<string,any> > products = Pkg::ResolvableProperties ("", `product, ""); if (size (products) == 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.17/yast2-packager-2.21.18/packager.pot new/yast2-packager-2.21.18/yast2-packager-2.21.18/packager.pot --- old/yast2-packager-2.21.17/yast2-packager-2.21.18/packager.pot 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-2.21.18/yast2-packager-2.21.18/packager.pot 2008-09-10 10:47:12.000000000 +0200 @@ -0,0 +1,99 @@ +# translation of packager.po to +# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg +# This file is distributed under the same license as the PACKAGE package. +# +# Andrew Spackman <[email protected]>, 2008. +msgid "" +msgstr "" +"Project-Id-Version: packager\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-08-04 13:54+0200\n" +"PO-Revision-Date: 2008-08-27 21:38+1200\n" +"Last-Translator: Andrew Spackman <[email protected]>\n" +"Language-Team: <[email protected]>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#: src/clients/inst_packages.ycp:76 +msgid "" +"<p>\n" +"\t\t This dialog allows you to define this system's tasks and what software to install.\n" +"\t\t Available tasks and software for this system are shown by category in the left\n" +"\t\t column. To view a description for an item, select it in the list.\n" +"\t\t </p>" +msgstr "" +"<p>\n" +"\t\t This dialog allows you to define this system's tasks and the software that has to be installed.\n" +"\t\t Available tasks and software for this system are shown by category in the left\n" +"\t\t column. To view a description for an item, select it in the list.\n" +"\t\t </p>" + +#. TRANSLATORS: dialog help +#: src/clients/inst_productsources.ycp:600 +msgid "" +"<p>Please wait while the packager is being initialized\n" +"and the list of servers dowloaded from Web.</p>\n" +msgstr "" +"<p>Please wait while the packager is being initialized\n" +"and the list of servers downloaded from the Web.</p>\n" + +#. help, continued +#: src/clients/repositories.ycp:486 +msgid "" +"<p>\n" +"<b>Synchronize Changes with ZENworks</b> will call <tt>rug</tt>\n" +"to also perform the changes in that package management system.</p>\n" +msgstr "" +"<p>\n" +"<b>Synchronize Changes with ZENworks</b> will also call <tt>rug</tt>\n" +"to perform the changes in that package management system.</p>\n" + +#: src/clients/webpin_package_search.ycp:223 +msgid "" +"<p><big><b>Security</b></big><br>\n" +"The software found is often not part of the distribution itself and the level of trust\n" +"depends on yourself. We do not take any responsibilities for installing\n" +"such software.</p>" +msgstr "" +"<p><big><b>Security</b></big><br>\n" +"The software found is often not part of the distribution itself and the level of trust\n" +"depends on yourself. We do not take any responsibility for installing\n" +"such software.</p>" + +#. help text - media check 2/8 +#: src/include/checkmedia/ui.ycp:279 +msgid "" +"<P>When you have a problem with\n" +"the installation and are using a CD or DVD installation medium, you should check\n" +"whether the medium is broken.</P>\n" +msgstr "" +"<P>When you have a problem with\n" +"the installation and you are using a CD or DVD installation medium, you should check\n" +"whether the medium is broken.</P>\n" + +#: src/include/checkmedia/ui.ycp:432 +msgid "" +"The medium does not contain MD5 checksum.\n" +"The content of the medium cannot be verified.\n" +"\n" +"Only readability of the medium will be checked." +msgstr "" +"The medium does not contain a MD5 checksum.\n" +"The content of the medium cannot be verified.\n" +"\n" +"Only readability of the medium will be checked." + +#. (see bnc#178357 why these numbers) +#. translators: help text for software proposal +#: src/modules/Packages.ycp:302 +msgid "<P>The propsal contains total size of files which will be installed to the system. However, the system will contain some other files (temporary and working files) so the used space will be slighltly larger than the proposed value. Therefore it is a good idea to have at least 25% (or 300MB) free space before starting the installation.</P>" +msgstr "<P>The propsal reports the total size of files which will be installed to the system. However, the system will contain some other files (temporary and working files) so the used space will be slighltly larger than the proposed value. Therefore it is a good idea to have at least 25% (or 300MB) free space before starting the installation.</P>" + +#. help text for software proposal +#: src/modules/Packages.ycp:304 +msgid "<P>The total size to download is size of packages which will be downloaded from remote (network) repositories. This value is important when the connection is slow or when there is a data limit for downloading.</P>" +msgstr "" +"<P>The total 'size to download' is the size of the packages which will be downloaded from remote (network) repositories.\n" +" This value is important when the connection is slow or when there is a data limit for downloading.</P>" continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
