Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at Tue Oct 18 14:35:27 CEST 2011.
-------- --- openSUSE:Factory/yast2-packager/yast2-packager.changes 2011-10-07 00:54:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2011-10-17 16:09:55.000000000 +0200 @@ -1,0 +2,14 @@ +Mon Oct 17 16:01:54 CEST 2011 - [email protected] + +- Readding missing feature supported in control file: Packages + required by a selected desktop in DefaultDesktop (bnc#724491). +- 2.21.20 + +------------------------------------------------------------------- +Wed Oct 12 15:09:39 CEST 2011 - [email protected] + +- do not add initrd modules when mkintrd itself can add them + (bnc#716785) +- 2.21.19 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-packager-2.21.18.tar.bz2 New: ---- yast2-packager-2.21.20.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.daVqWz/_old 2011-10-18 14:35:20.000000000 +0200 +++ /var/tmp/diff_new_pack.daVqWz/_new 2011-10-18 14:35:20.000000000 +0200 @@ -19,11 +19,11 @@ Name: yast2-packager -Version: 2.21.18 +Version: 2.21.20 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-%{version}.tar.bz2 +Source0: yast2-packager-2.21.20.tar.bz2 Prefix: /usr @@ -100,7 +100,7 @@ (webpin) and installing them via OneClickInstall %prep -%setup -n yast2-packager-%{version} +%setup -n yast2-packager-2.21.20 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-packager-2.21.18.tar.bz2 -> yast2-packager-2.21.20.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.18/Makefile.am new/yast2-packager-2.21.20/Makefile.am --- old/yast2-packager-2.21.18/Makefile.am 2011-10-06 14:15:13.000000000 +0200 +++ new/yast2-packager-2.21.20/Makefile.am 2011-10-17 16:05:17.000000000 +0200 @@ -20,6 +20,7 @@ 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 @@ -154,7 +155,7 @@ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-textdomain package-local +package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local TAGVERSION = $(Y2TOOL) tagversion @@ -184,6 +185,21 @@ 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.18/Makefile.in new/yast2-packager-2.21.20/Makefile.in --- old/yast2-packager-2.21.18/Makefile.in 2011-10-06 14:15:16.000000000 +0200 +++ new/yast2-packager-2.21.20/Makefile.in 2011-10-17 16:05:20.000000000 +0200 @@ -261,6 +261,7 @@ # 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 \ @@ -901,7 +902,7 @@ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-textdomain package-local +package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local check-up-to-date check-cvs-up-to-date check-svn-up-to-date: if [ -d $(srcdir)/CVS ]; then \ @@ -929,6 +930,21 @@ 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.18/VERSION new/yast2-packager-2.21.20/VERSION --- old/yast2-packager-2.21.18/VERSION 2011-10-06 13:58:48.000000000 +0200 +++ new/yast2-packager-2.21.20/VERSION 2011-10-17 16:03:22.000000000 +0200 @@ -1 +1 @@ -2.21.18 +2.21.20 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.18/configure new/yast2-packager-2.21.20/configure --- old/yast2-packager-2.21.18/configure 2011-10-06 14:15:15.000000000 +0200 +++ new/yast2-packager-2.21.20/configure 2011-10-17 16:05:19.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.18. +# Generated by GNU Autoconf 2.68 for yast2-packager 2.21.20. # # 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.18' -PACKAGE_STRING='yast2-packager 2.21.18' +PACKAGE_VERSION='2.21.20' +PACKAGE_STRING='yast2-packager 2.21.20' 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.18 to adapt to many kinds of systems. +\`configure' configures yast2-packager 2.21.20 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.18:";; + short | recursive ) echo "Configuration of yast2-packager 2.21.20:";; 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.18 +yast2-packager configure 2.21.20 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.18, which was +It was created by yast2-packager $as_me 2.21.20, 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.18' + VERSION='2.21.20' cat >>confdefs.h <<_ACEOF @@ -2449,7 +2449,7 @@ -VERSION="2.21.18" +VERSION="2.21.20" 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.18, which was +This file was extended by yast2-packager $as_me 2.21.20, 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.18 +yast2-packager config.status 2.21.20 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.18/configure.in new/yast2-packager-2.21.20/configure.in --- old/yast2-packager-2.21.18/configure.in 2011-10-06 14:15:13.000000000 +0200 +++ new/yast2-packager-2.21.20/configure.in 2011-10-17 16:05:17.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-packager dnl -dnl -- This file is generated by y2autoconf 2.21.4 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.21.18, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.21.20, 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.18" +VERSION="2.21.20" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.18/packager.pot new/yast2-packager-2.21.20/packager.pot --- old/yast2-packager-2.21.18/packager.pot 2008-09-10 10:47:12.000000000 +0200 +++ new/yast2-packager-2.21.20/packager.pot 1970-01-01 01:00:00.000000000 +0100 @@ -1,99 +0,0 @@ -# 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>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.18/src/clients/inst_kickoff.ycp new/yast2-packager-2.21.20/src/clients/inst_kickoff.ycp --- old/yast2-packager-2.21.18/src/clients/inst_kickoff.ycp 2011-09-02 11:16:30.000000000 +0200 +++ new/yast2-packager-2.21.20/src/clients/inst_kickoff.ycp 2011-10-17 10:39:56.000000000 +0200 @@ -5,7 +5,7 @@ * * Purpose: Do various tasks before starting with installation of rpms. * - * $Id: inst_kickoff.ycp 65232 2011-08-05 07:46:05Z lslezak $ + * $Id: inst_kickoff.ycp 66400 2011-10-12 13:10:33Z jsuchome $ * */ @@ -25,14 +25,6 @@ import "FileUtils"; import "String"; -void AcpiToInitrd () { - if (! (Arch::i386 () || Arch::x86_64 () || Arch::ia64 ())) - return; - foreach (string m, ["processor", "thermal", "fan"], { - Initrd::AddModule (m, ""); - }); -} - // add xen paravirtualized drivers to initrd if thery are selected for installation void XenPVToInitrd() { @@ -56,35 +48,6 @@ } } -void HyperVPVToInitrd() { - // is any hyper-v-kmp-* package selected? - if (Pkg::IsSelected("hyper-v-kmp-default") - || Pkg::IsSelected("hyper-v-kmp-smp") - || Pkg::IsSelected("hyper-v-kmp-pae") - || Pkg::IsSelected("hyper-v-kmp-bigsmp") - || Pkg::IsSelected("hyper-v-kmp-kdump")) - { - // add modules to initrd - Initrd::AddModule ("hv_blkvsc", ""); - Initrd::AddModule ("hv_netvsc", ""); - Initrd::AddModule ("hv_storvsc", ""); - Initrd::AddModule ("hv_vmbus", ""); - - y2milestone("Added HyperV PV drivers to initrd, configured drivers: %1", Initrd::ListModules()); - - // it also need to be added to MODULES_LOADED_ON_BOOT - Kernel::AddModuleToLoad ("hv_storvsc"); - Kernel::AddModuleToLoad ("hv_netvsc"); - y2milestone ("Added hv_storvsc and hv_netvsc to modules loaded on boot"); - - } - else - { - y2milestone("No hyper-v-kmp-* package is selected for installation, skipping HyperV PV driver installation"); - } -} - - /** * Write a fake mtab to the target system since some %post scripts might * need it. @@ -479,7 +442,6 @@ // fake mtab fake_mtab (); - AcpiToInitrd (); // F#302660: System installation and upgrade workflow: kernel %post // calling ins_bootloader write all config files for bootloader @@ -540,12 +502,10 @@ // Bootloader::PreUpdate (); // -- this function call does NOTHING! } - AcpiToInitrd (); } // add Xen and HyperV PV drivers to initrd XenPVToInitrd(); - HyperVPVToInitrd(); if (Stage::initial ()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.18/src/clients/install_test.ycp new/yast2-packager-2.21.20/src/clients/install_test.ycp --- old/yast2-packager-2.21.18/src/clients/install_test.ycp 2010-01-12 11:48:56.000000000 +0100 +++ new/yast2-packager-2.21.20/src/clients/install_test.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -{ - import "Package"; - - - Package::InstallAll(["yast2-nfs-server"]); -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.18/src/modules/DefaultDesktop.ycp new/yast2-packager-2.21.20/src/modules/DefaultDesktop.ycp --- old/yast2-packager-2.21.18/src/modules/DefaultDesktop.ycp 2009-04-29 12:58:11.000000000 +0200 +++ new/yast2-packager-2.21.20/src/modules/DefaultDesktop.ycp 2011-10-17 16:04:48.000000000 +0200 @@ -4,7 +4,7 @@ * Authors: Jiri Srain <[email protected]> * Lukas Ocilka <[email protected]> * - * $Id: DefaultDesktop.ycp 57028 2009-04-29 10:58:09Z lslezak $ + * $Id: DefaultDesktop.ycp 66469 2011-10-17 14:04:47Z locilka $ */ { @@ -156,7 +156,8 @@ * "label_id" : _("Desktop Name Visible in Dialog (original)"), * "description" : _("Description text of the desktop (localized - initial localization)"), * "description_id" : _("Description text of the desktop (originale)"), - * "patterns" : ["list", "of", "related", "patterns"], + * "patterns" : ["list", "of", "required", "patterns"], + * "packages" : ["list", "of", "required", "packages"], * "icon" : "some-icon", // filename from the 64x64 directory of the current theme (without .png suffix) * ], * ] @@ -220,7 +221,8 @@ return desktop; } -string packages_proposal_ID = "DefaultDesktop"; +string packages_proposal_ID_patterns = "DefaultDesktopPatterns"; +string packages_proposal_ID_packages = "DefaultDesktopPackages"; /** * Set the default desktop @@ -232,7 +234,8 @@ if (new_desktop == nil) { // Reset the selected patterns y2milestone ("Reseting DefaultDesktop"); - PackagesProposal::SetResolvables (packages_proposal_ID, `pattern, []); + PackagesProposal::SetResolvables (packages_proposal_ID_patterns, `pattern, []); + PackagesProposal::SetResolvables (packages_proposal_ID_packages, `package, []); } else if (! haskey (all_desktops, new_desktop)) { y2error ("Attempting to set desktop to unknown %1", new_desktop); } else { @@ -241,12 +244,21 @@ y2milestone ("New desktop has been set: %1", desktop); if (desktop != nil && desktop != "") { - // Require new patterns - PackagesProposal::SetResolvables (packages_proposal_ID, `pattern, all_desktops[desktop,"patterns"]:[]); + // Require new patterns and packages + PackagesProposal::SetResolvables (packages_proposal_ID_patterns, `pattern, all_desktops[desktop,"patterns"]:[]); + PackagesProposal::SetResolvables (packages_proposal_ID_packages, `package, all_desktops[desktop,"packages"]:[]); } } } +global list<string> SelectedPatterns() { + return PackagesProposal::GetResolvables (packages_proposal_ID_patterns, `pattern); +} + +global list<string> SelectedPackages() { + return PackagesProposal::GetResolvables (packages_proposal_ID_packages, `package); +} + /** * Get preffered window/desktop manager for the selected desktop * @return string preffered window/desktop manager, empty if no one diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.18/testsuite/tests/DefaultDesktop.out new/yast2-packager-2.21.20/testsuite/tests/DefaultDesktop.out --- old/yast2-packager-2.21.18/testsuite/tests/DefaultDesktop.out 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-2.21.20/testsuite/tests/DefaultDesktop.out 2011-10-17 15:58:07.000000000 +0200 @@ -0,0 +1,16 @@ +Dump --- All desktops --- +Return $["gnome":$["cursor":"DMZ", "desktop":"gnome", "icon":"pattern-gnome", "label":"GNOME Desktop", "label_id":"desktop_gnome", "logon":"gdm", "order":1, "packages":["gdm", "branding-openSUSE"], "patterns":["gnome", "x11", "base"]], "kde":$["cursor":"DMZ", "desktop":"kde4", "icon":"pattern-kde4", "label":"KDE Desktop", "label_id":"desktop_kde", "logon":"kdm", "order":1, "packages":["kdm", "branding-openSUSE"], "patterns":["kde", "x11", "base"]], "lxde":$["cursor":"DMZ", "desktop":"lxde", "icon":"pattern-lxde", "label":"LXDE Desktop", "label_id":"desktop_lxde", "logon":"lxdm", "order":5, "packages":["lxde-common", "branding-openSUSE"], "patterns":["lxde", "x11", "base"]], "min_x":$["cursor":"DMZ", "desktop":"twm", "icon":"yast-x11", "label":"Minimal X Window", "label_id":"desktop_min_x", "logon":"xdm", "order":6, "packages":["xorg-x11", "branding-openSUSE"], "patterns":["x11", "base"]], "textmode":$["cursor":"DMZ", "desktop":"twm", "icon":"yast-sshd", "label":"Minimal Server Selection (Text Mode)", "label_id":"desktop_textmode", "logon":"xdm", "order":8, "packages":["branding-openSUSE"], "patterns":["minimal_base", "minimal_base-conflicts"]], "xfce":$["cursor":"DMZ", "desktop":"xfce", "icon":"pattern-xfce", "label":"XFCE Desktop", "label_id":"desktop_xfce", "logon":"lightdm", "order":4, "packages":["lightdm", "branding-openSUSE"], "patterns":["xfce", "x11", "base"]]] +Dump --- KDE selected by default --- +Return kde +Return ["kde", "x11", "base"] +Return ["kdm", "branding-openSUSE"] +Dump --- Selecting GNOME --- +Return nil +Return gnome +Return ["gnome", "x11", "base"] +Return ["gdm", "branding-openSUSE"] +Dump --- Reset --- +Return nil +Return kde +Return ["kde", "x11", "base"] +Return ["kdm", "branding-openSUSE"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.18/testsuite/tests/DefaultDesktop.ycp new/yast2-packager-2.21.20/testsuite/tests/DefaultDesktop.ycp --- old/yast2-packager-2.21.18/testsuite/tests/DefaultDesktop.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-2.21.20/testsuite/tests/DefaultDesktop.ycp 2011-10-17 15:58:04.000000000 +0200 @@ -0,0 +1,67 @@ +{ +// testedfiles: DefaultDesktop + include "testsuite.ycp"; + + map READ = $[ + "target" : $[ + "size" : 55452, + "stat" : $["size" : 55452], + "tmpdir" : "/tmp/", + ], + "xml" : $[ + "software":$[ + // desktop selected by default + "default_desktop":"kde", + + // all available desktops + "supported_desktops":[ + $["cursor":"DMZ", "desktop":"gnome", "icon":"pattern-gnome", "label_id":"desktop_gnome", "logon":"gdm", "name":"gnome", "order":1, "packages":"gdm branding-openSUSE", "patterns":"gnome x11 base"], + $["cursor":"DMZ", "desktop":"kde4", "icon":"pattern-kde4", "label_id":"desktop_kde", "logon":"kdm", "name":"kde", "order":1, "packages":"kdm branding-openSUSE", "patterns":"kde x11 base"], + $["cursor":"DMZ", "desktop":"xfce", "icon":"pattern-xfce", "label_id":"desktop_xfce", "logon":"lightdm", "name":"xfce", "order":4, "packages":"lightdm branding-openSUSE", "patterns":"xfce x11 base"], + $["cursor":"DMZ", "desktop":"lxde", "icon":"pattern-lxde", "label_id":"desktop_lxde", "logon":"lxdm", "name":"lxde", "order":5, "packages":"lxde-common branding-openSUSE", "patterns":"lxde x11 base"], + $["cursor":"DMZ", "desktop":"twm", "icon":"yast-x11", "label_id":"desktop_min_x", "logon":"xdm", "name":"min_x", "order":6, "packages":"xorg-x11 branding-openSUSE", "patterns":"x11 base"], + $["cursor":"DMZ", "desktop":"twm", "icon":"yast-sshd", "label_id":"desktop_textmode", "logon":"xdm", "name":"textmode", "order":8, "packages":"branding-openSUSE", "patterns":"minimal_base minimal_base-conflicts"], + ], + ], + + // names for desktops + "texts":$[ + "desktop_gnome":$["label":"GNOME Desktop"], + "desktop_kde":$["label":"KDE Desktop"], + "desktop_lxde":$["label":"LXDE Desktop"], + "desktop_min_x":$["label":"Minimal X Window"], + "desktop_textmode":$["label":"Minimal Server Selection (Text Mode)"], + "desktop_xfce":$["label":"XFCE Desktop"], + ], + ], + ]; + map WRITE = $[]; + map EXEC = $[]; + + TESTSUITE_INIT ([READ, WRITE, EXEC], nil); + + import "DefaultDesktop"; + + DUMP(" --- All desktops --- "); + TEST(``(DefaultDesktop::GetAllDesktopsMap()), [READ, $[], EXEC], nil); + + // Using the default + DUMP(" --- KDE selected by default --- "); + TEST(``(DefaultDesktop::Desktop()), [READ, $[], EXEC], nil); + TEST(``(DefaultDesktop::SelectedPatterns()), [READ, $[], EXEC], nil); + TEST(``(DefaultDesktop::SelectedPackages()), [READ, $[], EXEC], nil); + + // Adjusting new variable + DUMP(" --- Selecting GNOME --- "); + TEST(``(DefaultDesktop::SetDesktop("gnome")), [READ, $[], EXEC], nil); + TEST(``(DefaultDesktop::Desktop()), [READ, $[], EXEC], nil); + TEST(``(DefaultDesktop::SelectedPatterns()), [READ, $[], EXEC], nil); + TEST(``(DefaultDesktop::SelectedPackages()), [READ, $[], EXEC], nil); + + // Back to the default + DUMP(" --- Reset --- "); + TEST(``(DefaultDesktop::ForceReinit()), [READ, $[], EXEC], nil); + TEST(``(DefaultDesktop::Desktop()), [READ, $[], EXEC], nil); + TEST(``(DefaultDesktop::SelectedPatterns()), [READ, $[], EXEC], nil); + TEST(``(DefaultDesktop::SelectedPackages()), [READ, $[], EXEC], nil); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.21.18/yast2-packager-2.21.18/packager.pot new/yast2-packager-2.21.20/yast2-packager-2.21.18/packager.pot --- old/yast2-packager-2.21.18/yast2-packager-2.21.18/packager.pot 2008-09-10 10:47:12.000000000 +0200 +++ new/yast2-packager-2.21.20/yast2-packager-2.21.18/packager.pot 1970-01-01 01:00:00.000000000 +0100 @@ -1,99 +0,0 @@ -# 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]
