Author: jsrain Date: Fri Sep 25 08:21:48 2009 New Revision: 58763 URL: http://svn.opensuse.org/viewcvs/yast?rev=58763&view=rev Log: merged the tmp/SLE-11-SP1-Stash branch Added: branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/schema/pxe.rnc - copied unchanged from r58762, branches/tmp/SLE-11-SP1-Stash/autoinstallation/src/schema/pxe.rnc branches/SuSE-Code-11-SP1-Branch/printer/agents/ - copied from r58762, branches/tmp/SLE-11-SP1-Stash/printer/agents/ branches/SuSE-Code-11-SP1-Branch/printer/agents/Makefile.am - copied unchanged from r58762, branches/tmp/SLE-11-SP1-Stash/printer/agents/Makefile.am branches/SuSE-Code-11-SP1-Branch/printer/agents/ag_cups - copied unchanged from r58762, branches/tmp/SLE-11-SP1-Stash/printer/agents/ag_cups branches/SuSE-Code-11-SP1-Branch/printer/agents/cfg_cups.scr - copied unchanged from r58762, branches/tmp/SLE-11-SP1-Stash/printer/agents/cfg_cups.scr Modified: branches/SuSE-Code-11-SP1-Branch/ (props changed) branches/SuSE-Code-11-SP1-Branch/add-on/package/yast2-add-on.changes branches/SuSE-Code-11-SP1-Branch/add-on/src/add-on-workflow.ycp branches/SuSE-Code-11-SP1-Branch/add-on/src/add-on_proposal.ycp branches/SuSE-Code-11-SP1-Branch/add-on/yast2-add-on.spec.in branches/SuSE-Code-11-SP1-Branch/apparmor/ (props changed) branches/SuSE-Code-11-SP1-Branch/apparmor/package/yast2-apparmor.changes branches/SuSE-Code-11-SP1-Branch/apparmor/src/include/subdomain/reporting_dialogues.ycp branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/clients/inst_autoconfigure.ycp branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/dialogs/partition_dialogs.ycp branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/include/autopart.ycp branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/include/conftree.ycp branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/include/io.ycp branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/include/xml.ycp branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/AutoinstLVM.ycp branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/AutoinstPartPlan.ycp branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/AutoinstPartition.ycp branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/Profile.ycp branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/Y2ModuleConfig.ycp branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/schema/classes-use.rnc branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/schema/rules.rnc branches/SuSE-Code-11-SP1-Branch/backup/package/yast2-backup.changes branches/SuSE-Code-11-SP1-Branch/backup/src/Backup.ycp branches/SuSE-Code-11-SP1-Branch/backup/src/functions.ycp branches/SuSE-Code-11-SP1-Branch/backup/src/help_texts.ycp branches/SuSE-Code-11-SP1-Branch/backup/src/ui.ycp branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-Code-11-SP1-Branch/bootloader/src/clients/bootloader.ycp branches/SuSE-Code-11-SP1-Branch/core/ (props changed) branches/SuSE-Code-11-SP1-Branch/core/libycp/src/YCPBuiltinList.cc branches/SuSE-Code-11-SP1-Branch/core/package/yast2-core.changes branches/SuSE-Code-11-SP1-Branch/country/language/data/language_sr_RS.ycp (props changed) branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-main.ycp branches/SuSE-Code-11-SP1-Branch/firstboot/package/yast2-firstboot.changes branches/SuSE-Code-11-SP1-Branch/firstboot/scripts/Firstboot-Stage/S08-start (props changed) branches/SuSE-Code-11-SP1-Branch/firstboot/scripts/Firstboot-Stage/S09-cleanup (props changed) branches/SuSE-Code-11-SP1-Branch/gtk/src/YGText.cc (props changed) branches/SuSE-Code-11-SP1-Branch/http-server/VERSION branches/SuSE-Code-11-SP1-Branch/http-server/agents/ag_http_server branches/SuSE-Code-11-SP1-Branch/http-server/package/yast2-http-server.changes branches/SuSE-Code-11-SP1-Branch/http-server/src/HttpServerWidgets.ycp branches/SuSE-Code-11-SP1-Branch/http-server/src/YaPI/HTTPD.pm branches/SuSE-Code-11-SP1-Branch/http-server/src/YaPI/HTTPDModules.pm branches/SuSE-Code-11-SP1-Branch/http-server/src/http-server.desktop branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLED.xml (contents, props changed) branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLES.xml branches/SuSE-Code-11-SP1-Branch/installation/control/control.openSUSE.xml branches/SuSE-Code-11-SP1-Branch/installation/doc/inst_images/details.xml.example (props changed) branches/SuSE-Code-11-SP1-Branch/installation/doc/inst_images/images.xml.example (props changed) branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_complex_welcome.ycp branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_mode.ycp branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_system_analysis.ycp branches/SuSE-Code-11-SP1-Branch/installation/src/clients/installation_settings_finish.ycp (props changed) branches/SuSE-Code-11-SP1-Branch/installation/src/modules/Vendor.ycp branches/SuSE-Code-11-SP1-Branch/iscsi-client/VERSION branches/SuSE-Code-11-SP1-Branch/iscsi-client/package/yast2-iscsi-client.changes branches/SuSE-Code-11-SP1-Branch/iscsi-client/src/IscsiClient.ycp branches/SuSE-Code-11-SP1-Branch/iscsi-client/src/IscsiClientLib.ycp branches/SuSE-Code-11-SP1-Branch/iscsi-client/src/dialogs.ycp branches/SuSE-Code-11-SP1-Branch/iscsi-client/src/helps.ycp branches/SuSE-Code-11-SP1-Branch/iscsi-client/src/iscsi-client.desktop branches/SuSE-Code-11-SP1-Branch/iscsi-client/src/iscsi-client_auto.ycp branches/SuSE-Code-11-SP1-Branch/iscsi-client/src/widgets.ycp branches/SuSE-Code-11-SP1-Branch/iscsi-client/src/wizards.ycp branches/SuSE-Code-11-SP1-Branch/iscsi-server/VERSION branches/SuSE-Code-11-SP1-Branch/iscsi-server/package/yast2-iscsi-server.changes branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/IscsiServer.ycp branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/IscsiServerFunctions.pm branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/dialogs.ycp branches/SuSE-Code-11-SP1-Branch/ldap-server/ (props changed) branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/package/yast2-ncurses-pkg.changes (props changed) branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgFilterPattern.cc (props changed) branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgFilterPattern.h (props changed) branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgFilterRPMGroups.cc (props changed) branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgFilterRPMGroups.h (props changed) branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgFilterRepo.cc (props changed) branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgFilterRepo.h (props changed) branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgFilterSearch.cc (props changed) branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgFilterSearch.h (props changed) branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgStrings.cc (props changed) branches/SuSE-Code-11-SP1-Branch/ncurses-pkg/src/NCPkgStrings.h (props changed) branches/SuSE-Code-11-SP1-Branch/network/VERSION branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP1-Branch/network/src/clients/dns.ycp branches/SuSE-Code-11-SP1-Branch/network/src/clients/lan_auto.ycp branches/SuSE-Code-11-SP1-Branch/network/src/clients/save_network.ycp branches/SuSE-Code-11-SP1-Branch/network/src/config/networking.rnc branches/SuSE-Code-11-SP1-Branch/network/src/lan/Makefile.am branches/SuSE-Code-11-SP1-Branch/network/src/lan/YaPI/ (props changed) branches/SuSE-Code-11-SP1-Branch/network/src/lan/YaPI/NETWORK.pm branches/SuSE-Code-11-SP1-Branch/network/src/lan/address.ycp branches/SuSE-Code-11-SP1-Branch/network/src/lan/bridge.ycp branches/SuSE-Code-11-SP1-Branch/network/src/lan/complex.ycp branches/SuSE-Code-11-SP1-Branch/network/src/lan/hardware.ycp branches/SuSE-Code-11-SP1-Branch/network/src/lan/help.ycp branches/SuSE-Code-11-SP1-Branch/network/src/lan/virtual.ycp branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp branches/SuSE-Code-11-SP1-Branch/network/src/modules/LanItems.ycp branches/SuSE-Code-11-SP1-Branch/network/src/modules/Provider.ycp branches/SuSE-Code-11-SP1-Branch/network/src/modules/Routing.ycp branches/SuSE-Code-11-SP1-Branch/network/src/routines/routines.ycp branches/SuSE-Code-11-SP1-Branch/network/src/services/proxy.ycp branches/SuSE-Code-11-SP1-Branch/network/testsuite/tests/Routing.out branches/SuSE-Code-11-SP1-Branch/network/yast2-network.spec.in branches/SuSE-Code-11-SP1-Branch/nfs-client/VERSION branches/SuSE-Code-11-SP1-Branch/nfs-client/package/yast2-nfs-client.changes branches/SuSE-Code-11-SP1-Branch/nfs-client/src/Nfs.ycp branches/SuSE-Code-11-SP1-Branch/nfs-client/src/ui.ycp branches/SuSE-Code-11-SP1-Branch/nfs-server/ (props changed) branches/SuSE-Code-11-SP1-Branch/ntp-client/ (props changed) branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP1-Branch/packager/src/modules/AddOnProduct.ycp branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageInstallation.ycp branches/SuSE-Code-11-SP1-Branch/packager/src/modules/PackageSlideShow.ycp branches/SuSE-Code-11-SP1-Branch/packager/src/modules/Packages.ycp branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SlideShowCallbacks.ycp branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Source_Load.cc branches/SuSE-Code-11-SP1-Branch/power-management/ (props changed) branches/SuSE-Code-11-SP1-Branch/printer/VERSION branches/SuSE-Code-11-SP1-Branch/printer/package/yast2-printer.changes branches/SuSE-Code-11-SP1-Branch/printer/src/Printer.ycp branches/SuSE-Code-11-SP1-Branch/printer/src/Printerlib.ycp branches/SuSE-Code-11-SP1-Branch/printer/src/basicadd.ycp branches/SuSE-Code-11-SP1-Branch/printer/src/basicmodify.ycp branches/SuSE-Code-11-SP1-Branch/printer/src/connectionwizard.ycp branches/SuSE-Code-11-SP1-Branch/printer/src/helps.ycp branches/SuSE-Code-11-SP1-Branch/printer/src/printer.desktop branches/SuSE-Code-11-SP1-Branch/printer/src/printer_auto.ycp branches/SuSE-Code-11-SP1-Branch/printer/src/printer_proposal.ycp branches/SuSE-Code-11-SP1-Branch/printer/src/printingvianetwork.ycp branches/SuSE-Code-11-SP1-Branch/printer/src/sharing.ycp branches/SuSE-Code-11-SP1-Branch/printer/yast2-printer.spec.in branches/SuSE-Code-11-SP1-Branch/qt/ (props changed) branches/SuSE-Code-11-SP1-Branch/qt-pkg/CMakeLists.txt (props changed) branches/SuSE-Code-11-SP1-Branch/qt-pkg/MAINTAINER (props changed) branches/SuSE-Code-11-SP1-Branch/qt-pkg/Makefile.cvs (props changed) branches/SuSE-Code-11-SP1-Branch/qt-pkg/VERSION.cmake (props changed) branches/SuSE-Code-11-SP1-Branch/qt-pkg/cmake/ (props changed) branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/ (props changed) branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/YQPackageSelectorPluginImpl.cc (props changed) branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/YQPackageSelectorPluginImpl.h (props changed) branches/SuSE-Code-11-SP1-Branch/qt-pkg/yast2-qt-pkg.spec.in (props changed) branches/SuSE-Code-11-SP1-Branch/qt/package/yast2-qt.changes (contents, props changed) branches/SuSE-Code-11-SP1-Branch/qt/src/YQMainWinDock.cc branches/SuSE-Code-11-SP1-Branch/qt/src/YQUI.cc (props changed) branches/SuSE-Code-11-SP1-Branch/qt/src/YQWizard.cc branches/SuSE-Code-11-SP1-Branch/qt/src/YQWizard.h branches/SuSE-Code-11-SP1-Branch/qt/yast2-qt.spec.in (props changed) branches/SuSE-Code-11-SP1-Branch/reipl/package/yast2-reipl.changes branches/SuSE-Code-11-SP1-Branch/reipl/src/Reipl.ycp branches/SuSE-Code-11-SP1-Branch/restore/package/yast2-restore.changes branches/SuSE-Code-11-SP1-Branch/restore/src/ui.ycp branches/SuSE-Code-11-SP1-Branch/runlevel/package/yast2-runlevel.changes branches/SuSE-Code-11-SP1-Branch/runlevel/src/runlevel_proposal.ycp branches/SuSE-Code-11-SP1-Branch/s390/VERSION branches/SuSE-Code-11-SP1-Branch/s390/package/yast2-s390.changes branches/SuSE-Code-11-SP1-Branch/s390/src/zfcp/dialogs.ycp branches/SuSE-Code-11-SP1-Branch/slp-server/VERSION branches/SuSE-Code-11-SP1-Branch/slp-server/package/yast2-slp-server.changes branches/SuSE-Code-11-SP1-Branch/slp-server/src/dialogs.ycp branches/SuSE-Code-11-SP1-Branch/storage/multipath-simple/src/multipath-simple.ycp (props changed) branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/do_proposal_flexible.ycp branches/SuSE-Code-11-SP1-Branch/support/ (props changed) branches/SuSE-Code-11-SP1-Branch/support/package/yast2-support.changes (props changed) branches/SuSE-Code-11-SP1-Branch/support/src/Support.ycp (props changed) branches/SuSE-Code-11-SP1-Branch/support/src/support (props changed) branches/SuSE-Code-11-SP1-Branch/support/src/support.desktop (props changed) branches/SuSE-Code-11-SP1-Branch/support/src/support.ycp (props changed) branches/SuSE-Code-11-SP1-Branch/support/src/support_auto.ycp (props changed) branches/SuSE-Code-11-SP1-Branch/support/src/support_proposal.ycp (props changed) branches/SuSE-Code-11-SP1-Branch/support/testsuite/tests/Support.err (props changed) branches/SuSE-Code-11-SP1-Branch/support/testsuite/tests/Support.out (props changed) branches/SuSE-Code-11-SP1-Branch/support/testsuite/tests/Support.ycp (props changed) branches/SuSE-Code-11-SP1-Branch/support/testsuite/yast2-support.test/ (props changed) branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Oxygen/Makefile.am (props changed) branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Oxygen/icons/22x22/Makefile.am (props changed) branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Oxygen/icons/22x22/apps/Makefile.am (props changed) branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Oxygen/icons/32x32/Makefile.am (props changed) branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Oxygen/icons/32x32/apps/Makefile.am (props changed) branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Oxygen/icons/48x48/Makefile.am (props changed) branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Oxygen/icons/48x48/apps/Makefile.am (props changed) branches/SuSE-Code-11-SP1-Branch/theme/openSUSE-Oxygen/icons/Makefile.am (props changed) branches/SuSE-Code-11-SP1-Branch/theme/openSUSE/wizard/installation.qss (props changed) branches/SuSE-Code-11-SP1-Branch/transfer/VERSION branches/SuSE-Code-11-SP1-Branch/transfer/agent-tftp/src/TftpAgent.cc branches/SuSE-Code-11-SP1-Branch/transfer/package/yast2-transfer.changes branches/SuSE-Code-11-SP1-Branch/tv/ (props changed) branches/SuSE-Code-11-SP1-Branch/tv/package/yast2-tv.changes branches/SuSE-Code-11-SP1-Branch/tv/src/Tv.ycp branches/SuSE-Code-11-SP1-Branch/tv/src/irc_ui.ycp branches/SuSE-Code-11-SP1-Branch/tv/src/misc.ycp branches/SuSE-Code-11-SP1-Branch/update/package/yast2-update.changes branches/SuSE-Code-11-SP1-Branch/update/src/modules/RootPart.ycp branches/SuSE-Code-11-SP1-Branch/update/src/scripts/update_users_groups branches/SuSE-Code-11-SP1-Branch/wagon/src/config/cd_update.desktop (props changed) branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp (props changed) branches/SuSE-Code-11-SP1-Branch/yast2/ (props changed) branches/SuSE-Code-11-SP1-Branch/yast2/library/agents/etc_ssh_sshd_config.scr (props changed) branches/SuSE-Code-11-SP1-Branch/yast2/library/control/src/InstExtensionImage.ycp (props changed) branches/SuSE-Code-11-SP1-Branch/yast2/library/desktop/src/Desktop.ycp branches/SuSE-Code-11-SP1-Branch/yast2/library/modules/ConfigHistory.ycp (props changed) branches/SuSE-Code-11-SP1-Branch/yast2/library/network/agents/network.scr.in (props changed) branches/SuSE-Code-11-SP1-Branch/yast2/library/network/agents/sysconfig_SuSEfirewall2.scr (props changed) branches/SuSE-Code-11-SP1-Branch/yast2/library/network/src/NetworkInterfaces.ycp branches/SuSE-Code-11-SP1-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces.err (props changed) branches/SuSE-Code-11-SP1-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces.out (props changed) branches/SuSE-Code-11-SP1-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces.ycp (props changed) branches/SuSE-Code-11-SP1-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces2.err (props changed) branches/SuSE-Code-11-SP1-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces2.out (props changed) branches/SuSE-Code-11-SP1-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces2.ycp (props changed) branches/SuSE-Code-11-SP1-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces3.err (props changed) branches/SuSE-Code-11-SP1-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces3.out (props changed) branches/SuSE-Code-11-SP1-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces3.ycp (props changed) branches/SuSE-Code-11-SP1-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces4.err (props changed) branches/SuSE-Code-11-SP1-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces4.out (props changed) branches/SuSE-Code-11-SP1-Branch/yast2/library/network/testsuite/tests/NetworkInterfaces4.ycp (props changed) branches/SuSE-Code-11-SP1-Branch/yast2/library/packages/src/PackageCallbacks.ycp branches/SuSE-Code-11-SP1-Branch/yast2/library/packages/src/PackageSystem.ycp branches/SuSE-Code-11-SP1-Branch/yast2/library/packages/src/PackagesProposal.ycp (props changed) branches/SuSE-Code-11-SP1-Branch/yast2/library/packages/src/PackagesUI.ycp (props changed) branches/SuSE-Code-11-SP1-Branch/yast2/library/packages/src/SlideShow.ycp (props changed) branches/SuSE-Code-11-SP1-Branch/yast2/library/packages/src/Slides.ycp (props changed) branches/SuSE-Code-11-SP1-Branch/yast2/library/system/src/Kernel.ycp branches/SuSE-Code-11-SP1-Branch/yast2/library/wizard/src/Wizard.ycp branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes Modified: branches/SuSE-Code-11-SP1-Branch/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/add-on/package/yast2-add-on.changes?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/add-on/package/yast2-add-on.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/add-on/package/yast2-add-on.changes Fri Sep 25 08:21:48 2009 @@ -1,4 +1,28 @@ ------------------------------------------------------------------- +Mon Jul 13 11:06:02 CEST 2009 - locilka@suse.cz + +- Recalculating layout after redrawing the list of currently used + Add-Ons (bnc #517919). + +------------------------------------------------------------------- +Fri Apr 3 14:34:11 CEST 2009 - locilka@suse.cz + +- Adjusting initial repository name according to LABEL in content + file (bnc #481828). + +------------------------------------------------------------------- +Wed Mar 18 17:59:31 CET 2009 - locilka@suse.cz + +- Removing a work around that broke the possibility to use several + add-ons with the same URL (especially physical media-based ones) + SLE11 can still hit this issue (bnc #475352). + +------------------------------------------------------------------- +Fri Mar 13 12:30:23 CET 2009 - locilka@suse.cz + +- Solving MenuButton shortcut conflicts (bnc #50003 c#39). + +------------------------------------------------------------------- Wed Feb 18 13:26:03 CET 2009 - locilka@suse.cz - Reloading libzypp state if user declines the Add-On Modified: branches/SuSE-Code-11-SP1-Branch/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/add-on/src/add-on-workflow.ycp?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/add-on/src/add-on-workflow.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/add-on/src/add-on-workflow.ycp Fri Sep 25 08:21:48 2009 @@ -10,6 +10,7 @@ * * Authors: * Jiri Srain + * Lukas Ocilka * * */ @@ -34,6 +35,7 @@ import "Installation"; import "PackageCallbacks"; import "PackagesUI"; +import "Packages"; include "packager/inst_source_dialogs.ycp"; include "packager/repositories_include.ycp"; @@ -195,6 +197,8 @@ }); if (src_id_found) { + // BNC #481828: Using LABEL from content file as a repository name + Packages::AdjustSourcePropertiesAccordingToProduct (AddOnProduct::src_id); // used add-ons are stored in a special list AddAddOnToStore (AddOnProduct::src_id); } else { @@ -286,14 +290,9 @@ // busy message UI::OpenDialog(`Label(`id (`add_on_popup_id), _("Initializing new source..."))); integer src_id = SourceManager::newSources[0]:0; - map data = Pkg::SourceGeneralData (src_id); - y2milestone("Adding product: %1", data); - string url = data["url"]:""; - string product_dir = data["product_dir"]:""; - y2milestone ("Deleting source %1", src_id); - Pkg::SourceDelete (src_id); - src_id = Pkg::SourceCreate (url, product_dir); - SourceManager::newSources = [src_id]; + + // BNC #481828: Using LABEL from content file as a repository name + Packages::AdjustSourcePropertiesAccordingToProduct (src_id); // a little hack because of packager leaving // windows open... @@ -309,16 +308,6 @@ } } - if (src_id == -1) - { - // error report - Report::Error (_("Failed to initialize the software repository.")); - AddOnProduct::ClearRegistrationRequest (src_id); - - y2milestone ("CatalogSelect Dialog ret: %1", AddOnProduct::last_ret); - return `finish; - } - AddOnProduct::src_id = src_id; SourceManager::newSources = [src_id]; y2milestone ("Only one source available - skipping dialog"); @@ -326,6 +315,7 @@ y2milestone ("CatalogSelect Dialog ret: %1", AddOnProduct::last_ret); return AddOnProduct::last_ret; } + y2milestone ("Running catalog select dialog"); list catalogs = maplist (integer src, sources, { map data = Pkg::SourceGeneralData (src); @@ -360,17 +350,8 @@ if (ret == `abort || ret == `cancel) { ret = `abort; -// if (Stage::initial()) -// { -// if (Popup::ConfirmAbort (`painless)) -// break; -// } -// else -// { - // yes-no popup - if (Popup::YesNo (_("Really abort add-on product installation?"))) - break; -// } + if (Popup::YesNo (_("Really abort add-on product installation?"))) + break; continue; } else if (ret == `back) @@ -401,26 +382,13 @@ foreach (integer src, SourceManager::newSources, { if (src != selected) { - y2milestone ("Deleting source %1", src); + y2milestone ("Deleting unused source %1", src); Pkg::SourceDelete (src); } }); - map data = Pkg::SourceGeneralData (selected); - string url = data["url"]:""; - string product_dir = data["product_dir"]:""; - y2milestone ("Deleting source %1", selected); - Pkg::SourceDelete (selected); - selected = Pkg::SourceCreate (url, product_dir); - SourceManager::newSources = [selected]; - if (selected == -1) - { - // error report - Report::Error (_("Failed to initialize the software repository.")); - AddOnProduct::ClearRegistrationRequest (selected); - y2milestone ("CatalogSelect Dialog ret: %1", `finish); - return `finish; - } + // BNC #481828: Using LABEL from content file as a repository name + Packages::AdjustSourcePropertiesAccordingToProduct (selected); AddOnProduct::src_id = selected; SourceManager::newSources = [selected]; @@ -553,38 +521,6 @@ return `next; } -// disabling functionality (partly bugzilla #227605) -// we know whether this product is already installed -// but we can't know whether the source hasn't been already removed -// -// products = filter (map prod, products, { -// boolean installed = false; -// find (map p, installed_products, { -// if (p["name"]:"" == prod["name"]:"" && p["version"]:"" == prod["version"]:"") -// { -// installed = true; -// y2milestone ("Product %1 installed", p); -// return true; -// } -// return false; -// }); -// if (installed) -// { -// y2milestone ("Removing %1 from the list of available products", prod); -// return false; -// } -// return true; -// }); -// if (size (products) == 0) -// { -// // message popup -// Popup::Message (_("The product on the media is already installed -//or selected for installation.")); -// y2milestone ("Deleting installatino source %1", AddOnProduct::src_id); -// Pkg::SourceDelete (AddOnProduct::src_id); -// AddOnProduct::ClearRegistrationRequest (AddOnProduct::src_id); -// return `finish; -// } // Display /media.1/info.txt if such file exists // Display license and wait for agreement // FIXME the same code is above @@ -604,21 +540,6 @@ // this product with this url has been already installed or selected for installation map src_general_data = Pkg::SourceGeneralData (AddOnProduct::src_id); string current_url = src_general_data["url"]:""; - if (current_url != "" && current_url != nil) { - y2milestone ("%1", already_used_urls); - if (already_used_urls[current_url]:"" == src_general_data["product_dir"]:"") { - // error pop-up - Popup::Message (_("The product on the media is already installed -or selected for installation.")); - y2milestone ("Deleting installation source %1 %2 (%3)", - AddOnProduct::src_id, current_url, src_general_data["product_dir"]:""); - Pkg::SourceDelete (AddOnProduct::src_id); - AddOnProduct::ClearRegistrationRequest (AddOnProduct::src_id); - - y2milestone ("ProductSelect Dialog ret: %1", `finish); - return `finish; - } - } y2milestone ("Only one product available - skipping dialog"); map prod = products[0]:$[]; @@ -760,23 +681,6 @@ string url = data["url"]:""; string product_dir = data["product_dir"]:""; - // bugzilla #227605 - // this product with this url has been already installed or selected for installation - if (url != "" && url != nil) { - if (already_used_urls[url]:"" == product_dir) { - // error pop-up - Popup::Message (_("The product on the media is already installed -or selected for installation.")); - y2milestone ("Deleting installation source %1 %2 (%3)", - AddOnProduct::src_id, url, product_dir); - Pkg::SourceDelete (AddOnProduct::src_id); - AddOnProduct::ClearRegistrationRequest (AddOnProduct::src_id); - - y2milestone ("ProductSelect Dialog ret: %1", `finish); - return `finish; - } - } - foreach (string product, selected, { integer src_id = (AddOnProduct::src_id == -1 ? prod2src[product]:-1 : AddOnProduct::src_id); @@ -1194,6 +1098,10 @@ Wizard::HideBackButton(); Wizard::SetAbortButton (`abort, Label::CancelButton()); Wizard::SetNextButton (`next, Label::OKButton()); + + // BNC #517919: Broken layout in some obscure cases + // Fixing it... + UI::RecalcLayout(); } map product_infos = $[]; Modified: branches/SuSE-Code-11-SP1-Branch/add-on/src/add-on_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/add-on/src/add-on_proposal.ycp?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/add-on/src/add-on_proposal.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/add-on/src/add-on_proposal.ycp Fri Sep 25 08:21:48 2009 @@ -72,7 +72,7 @@ // this is a heading "rich_text_title" : _( "Add-On Products" ), // this is a menu entry - "menu_title" : _( "Add-On &Products" ), + "menu_title" : _( "Add-&On Products" ), "id" : "add_on" ]; } Modified: branches/SuSE-Code-11-SP1-Branch/add-on/yast2-add-on.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/add-on/yast2-add-on.spec.in?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/add-on/yast2-add-on.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/add-on/yast2-add-on.spec.in Fri Sep 25 08:21:48 2009 @@ -7,8 +7,8 @@ Requires: yast2-installation Requires: yast2-country -# repositories_include.ycp -Requires: yast2-packager >= 2.16.47 +# Packages::AdjustSourcePropertiesAccordingToProduct +Requires: yast2-packager >= 2.17.60 # bugzilla #335582, new API for StorageDevices Requires: yast2-storage >= 2.16.1 Modified: branches/SuSE-Code-11-SP1-Branch/apparmor/package/yast2-apparmor.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/apparmor/package/yast2-apparmor.changes?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/apparmor/package/yast2-apparmor.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/apparmor/package/yast2-apparmor.changes Fri Sep 25 08:21:48 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Mar 18 15:20:01 CET 2009 - kmachalkova@suse.cz + +- Convert report names and modes to/from human readable strings + (bnc#369119, bnc#371072) + +------------------------------------------------------------------- Fri Mar 6 17:34:06 CET 2009 - kmachalkova@suse.cz - AA profiles editor adjusted to the new format of parsed profile Modified: branches/SuSE-Code-11-SP1-Branch/apparmor/src/include/subdomain/reporting_dialogues.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/apparmor/src/include/subdomain/reporting_dialogues.ycp?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/apparmor/src/include/subdomain/reporting_dialogues.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/apparmor/src/include/subdomain/reporting_dialogues.ycp Fri Sep 25 08:21:48 2009 @@ -39,6 +39,51 @@ `md_28: "28", `md_29: "29", `md_30: "30", `md_31: "31" ]; +string modeToHumanString( string mode) { + return ( mode == "All") ? _("All") : mode; +} + +string humanStringToMode( string hs) { + return ( hs == _("All")) ? "All" : hs ; +} + +string typeToHumanString( string type ) { + string ret = ""; + + switch ( type ) + { + case "Security.Incident.Report": + ret = _("Security Incident Report"); + break; + case "Applications.Audit": + ret = _("Applications Audit Report"); + break; + case "Executive.Security.Summary": + ret = _("Executive Security Summary"); + break; + default: + ret = type; + break; + } + + return ret; +} + +string humanStringToType( string hs ) { + string ret = ""; + + if( hs == _("Security Incident Report")) + ret = "Security.Incident.Report"; + else if ( hs == _("Applications Audit Report")) + ret = "Applications.Audit"; + else if ( hs == _("Executive Security Summary")) + ret = "Executive.Security.Summary"; + else + ret = hs; + + return ret; +} + // Grey out inappropriate paging buttons define void setPageButtons(integer curPage, integer lastPage) { @@ -205,12 +250,12 @@ `VBox( `Label( _("Access Type: ") ), `Bottom( `HWeight( 4, - `ReplacePoint(`id(`replace_sdmode), `PushButton(`id(`sdmode), sdmode )))) + `ReplacePoint(`id(`replace_sdmode), `PushButton(`id(`sdmode), modeToHumanString( sdmode ))))) ), `VBox( `Label( _("Mode: ") ), `Bottom( `HWeight( 4, - `ReplacePoint(`id(`replace_mode), `PushButton(`id(`mode), mode )))) + `ReplacePoint(`id(`replace_mode), `PushButton(`id(`mode), modeToHumanString( mode ))))) ), `HSpacing( `opt(`hstretch), 1) ), @@ -252,7 +297,7 @@ ), `VBox( `Label( _("Mode: ") ), - `ReplacePoint(`id(`replace_mode), `PushButton(`id(`mode), "All" )) + `ReplacePoint(`id(`replace_mode), `PushButton(`id(`mode), _("All") )) ), //`HWeight( 4, `ReplacePoint(`id(`replace_sdmode), `PushButton(`id(`sdmode), _("Access Type: R") ))), @@ -312,7 +357,7 @@ ), `VBox( `Label( _("Mode: ") ), - `ReplacePoint(`id(`replace_mode), `PushButton(`id(`mode), "All" )) + `ReplacePoint(`id(`replace_mode), `PushButton(`id(`mode), _("All") )) ), @@ -402,11 +447,11 @@ `TextEntry(`id(`res), _("Detail"), res), `VBox( `Label( _("Access Type: ") ), - `ReplacePoint(`id(`replace_sdmode), `PushButton(`id(`sdmode), sdmode )) + `ReplacePoint(`id(`replace_sdmode), `PushButton(`id(`sdmode), modeToHumanString( sdmode ))) ), `VBox( `Label( _("Mode: ") ), - `ReplacePoint(`id(`replace_mode), `PushButton(`id(`mode), mode )) + `ReplacePoint(`id(`replace_mode), `PushButton(`id(`mode), modeToHumanString( mode ))) ) ), `VSpacing( 0.5 ), @@ -892,7 +937,7 @@ if ( sdmode != "" ) { Settings["sdmode"] = sdmode; - UI::ReplaceWidget(`id(`replace_sdmode), `PushButton(`id(`sdmode), sdmode) ); + UI::ReplaceWidget(`id(`replace_sdmode), `PushButton(`id(`sdmode), modeToHumanString( sdmode) ) ); } } else if ( id == `mode ) { @@ -901,7 +946,7 @@ if ( mode != "" ) { Settings["mode"] = mode; - UI::ReplaceWidget(`id(`replace_mode), `PushButton(`id(`mode), mode) ); + UI::ReplaceWidget(`id(`replace_mode), `PushButton(`id(`mode), modeToHumanString( mode ))); } } else if ( id == `browse ) { @@ -946,8 +991,6 @@ // de-i18n if ( sev == _("All") ) { sev = "All"; } if ( sev == _("U") ) { sev = "U"; } - if ( sdmode == _("All") ) { sdmode = "All"; } - if ( mode == _("All") ) { mode = "All"; } if (exppath != "" ) { Settings["exportPath"] = expPath; } if ( program_name != "" ) { Settings["prog"] = program_name; } @@ -955,8 +998,8 @@ if ( pid != "" ) { Settings["pid"] = pid; } if ( sev != "" && sev != "All" ) { Settings["severity"] = sev; } if ( res != "" ) { Settings["resource"] = res; } - if ( sdmode != "" ) { Settings["sdmode"] = sdmode; } - if ( mode != "" ) { Settings["mode"] = mode; } + if ( sdmode != "" ) { Settings["sdmode"] = humanStringToMode( sdmode); } + if ( mode != "" ) { Settings["mode"] = humanStringToMode( mode ); } if ( bydate == true ) { @@ -1412,7 +1455,7 @@ define symbol displayRunForm() { integer itemselected = ((integer) UI::QueryWidget(`id(`table), `CurrentItem) ); - string name = (string) select((term) UI::QueryWidget(`id(`table), `Item(itemselected)), 1, ""); + string name = humanStringToType( (string) select((term) UI::QueryWidget(`id(`table), `Item(itemselected)), 1, "")); string type = ""; @@ -1793,7 +1836,7 @@ if (sdmode != "") { Settings["sdmode"] = sdmode; - UI::ReplaceWidget(`id(`replace_sdmode), `PushButton(`id(`sdmode), sdmode) ); + UI::ReplaceWidget(`id(`replace_sdmode), `PushButton(`id(`sdmode), modeToHumanString( sdmode) )); } } else if ( addInput == `mode ) { @@ -1802,7 +1845,7 @@ if (mode != "") { Settings["mode"] = mode; - UI::ReplaceWidget(`id(`replace_mode), `PushButton(`id(`mode), mode) ); + UI::ReplaceWidget(`id(`replace_mode), `PushButton(`id(`mode), modeToHumanString( mode )) ); } } else if (addInput == `save ) { @@ -1833,8 +1876,8 @@ Settings["pid"] = pid; Settings["sev"] = sev; Settings["res"] = res; - Settings["sdmode"] = sdmode; - Settings["mode"] = mode; + Settings["sdmode"] = humanStringToMode( sdmode ); + Settings["mode"] = humanStringToMode( mode ); any error = (any) SCR::Write(.reports_sched, Settings); @@ -1889,7 +1932,7 @@ define void editSchedForm() { integer itemselected = ((integer) UI::QueryWidget(`id(`table), `CurrentItem) ); - string name = (string) select((term) UI::QueryWidget(`id(`table), `Item(itemselected)), 1, ""); + string name = humanStringToType( (string) select((term) UI::QueryWidget(`id(`table), `Item(itemselected)), 1, "")); map Settings = $[ ]; string readSched = "1"; @@ -2018,7 +2061,7 @@ } - string edLabel = _("Edit Report Schedule for ") + sname; + string edLabel = _("Edit Report Schedule for ") + typeToHumanString(sname); UI::OpenDialog( @@ -2139,7 +2182,7 @@ if ( sdmode != "" ) { Settings["sdmode"] = sdmode; - UI::ReplaceWidget(`id(`replace_sdmode), `PushButton(`id(`sdmode), sdmode) ); + UI::ReplaceWidget(`id(`replace_sdmode), `PushButton(`id(`sdmode), modeToHumanString( sdmode) )); } } else if ( editInput == `mode ) { @@ -2147,7 +2190,7 @@ mode = popUpMode(); if ( mode != "" ) { Settings["mode"] = mode; - UI::ReplaceWidget(`id(`replace_mode), `PushButton(`id(`mode), mode) ); + UI::ReplaceWidget(`id(`replace_mode), `PushButton(`id(`mode), modeToHumanString( mode ))); } } else if ( editInput == `browse ) { @@ -2203,8 +2246,8 @@ Settings["pid"] = pid; Settings["sev"] = sev; Settings["res"] = res; - Settings["sdmode"] = sdmode; - Settings["mode"] = mode; + Settings["sdmode"] = humanStringToMode( sdmode ); + Settings["mode"] = humanStringToMode( mode ); } else { @@ -2251,7 +2294,7 @@ define void delSchedForm() { integer itemselected = ((integer) UI::QueryWidget(`id(`table), `CurrentItem) ); - string name = (string) select((term) UI::QueryWidget(`id(`table), `Item(itemselected)), 1, ""); + string name = humanStringToType( (string) select((term) UI::QueryWidget(`id(`table), `Item(itemselected)), 1, "")); map Settings = $[ ]; Settings["del"] = "1"; @@ -2310,7 +2353,7 @@ list <map> db = (list <map>) SCR::Read (.reports_sched, Settings); foreach ( map record, db, { - itemList = add( itemList, `item( `id(key), record["name"]:nil, record["mday"]:nil, record["wday"]:nil, + itemList = add( itemList, `item( `id(key), typeToHumanString( record["name"]:"" ), record["mday"]:nil, record["wday"]:nil, record["hour"]:nil, record["mins"]:nil )); key = key + 1; }); @@ -2359,7 +2402,7 @@ list <map> db = (list <map>) SCR::Read (.reports_sched, Settings); foreach ( map record, db, { - itemList = add( itemList, `item( `id(key), record["name"]:nil, record["mday"]:nil, record["wday"]:nil, + itemList = add( itemList, `item( `id(key), typeToHumanString( record["name"]:""), record["mday"]:nil, record["wday"]:nil, record["hour"]:nil, record["mins"]:nil )); key = key + 1; }); @@ -2429,7 +2472,7 @@ } else if ( id == `delete ) { integer itemselected = ((integer) UI::QueryWidget(`id(`table), `CurrentItem) ); - string repName = (string) select((term) UI::QueryWidget(`id(`table), `Item(itemselected)), 1, ""); + string repName = humanStringToType( (string) select((term) UI::QueryWidget(`id(`table), `Item(itemselected)), 1, "")); if ( repName == "Executive.Security.Summary" || repName == "Applications.Audit" || repName == "Security.Incident.Report" ) { Popup::Error( _("Cannot delete a stock report.") ); Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes Fri Sep 25 08:21:48 2009 @@ -1,4 +1,66 @@ ------------------------------------------------------------------- +Mon Jun 29 13:35:38 CEST 2009 - ug@suse.de + +- <pxe> schema file added (bnc#516813) + +------------------------------------------------------------------- +Tue Jun 16 15:28:58 CEST 2009 - ug@suse.de + +- autoyast=usb://... could fail to find profile on logical + partitions (bnc#513536) + +------------------------------------------------------------------- +Tue Jun 16 13:44:19 CEST 2009 - ug@suse.de + +- cloning striped LVM fixed (bnc#513509) + +------------------------------------------------------------------- +Tue Jun 16 13:40:02 CEST 2009 - ug@suse.de + +- striping added to schema file (bnc#513449) + +------------------------------------------------------------------- +Mon Jun 15 12:54:34 CEST 2009 - ug@suse.de + +- fix for autoyast profile on by-id devices + (bnc#513127) + +------------------------------------------------------------------- +Mon May 4 11:57:02 CEST 2009 - ug@suse.de + +- don't log passwords from "ask" fixed (bnc#492746) + +------------------------------------------------------------------- +Wed Apr 8 15:17:20 CEST 2009 - ug@suse.de + +- don't log <ask> via milestone anymore (bnc#492746) + +------------------------------------------------------------------- +Wed Apr 8 12:19:03 CEST 2009 - ug@suse.de + +- classes and rules RNC files fixed (bnc#493172) + +------------------------------------------------------------------- +Tue Mar 31 14:54:59 CEST 2009 - ug@suse.de + +- default filesystem changed to ext3 (bnc#490389) + +------------------------------------------------------------------- +Wed Mar 18 13:07:16 CET 2009 - ug@suse.de + +- fixed the translation of module/groups in the UI (bnc#448238) + +------------------------------------------------------------------- +Wed Mar 18 12:53:43 CET 2009 - ug@suse.de + +- software RAID cloning fixed (bnc#480690) + +------------------------------------------------------------------- +Wed Mar 18 12:17:24 CET 2009 - ug@suse.de + +- autoyast fails to add add-on product with iso image (bnc#484735) + +------------------------------------------------------------------- Tue Jun 16 10:19:55 CEST 2009 - ug@suse.de - striping added to schema file (bnc#513449) Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/clients/inst_autoconfigure.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/clients/inst_autoconfigure.ycp?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/clients/inst_autoconfigure.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/clients/inst_autoconfigure.ycp Fri Sep 25 08:21:48 2009 @@ -161,7 +161,12 @@ result[res] = Profile::current[res]:[]; i = i + 1; }); - y2milestone("Calling auto client with: %1", result); + if( d["X-SuSE-YaST-AutoLogResource"]:"true" == "true" ) { + y2milestone("Calling auto client with: %1", result); + } else { + y2milestone("logging for resource %1 turned off",resource); + y2debug("Calling auto client with: %1", result); + } if (size(result) > 0 ) logStep( sformat (_("Configuring %1"), p)); else @@ -174,7 +179,12 @@ } else if (d["X-SuSE-YaST-AutoInstDataType"]:"map" == "map") { - y2milestone("Calling auto client with: %1", eval(Profile::current[resource]:$[])); + if( d["X-SuSE-YaST-AutoLogResource"]:"true" == "true" ) { + y2milestone("Calling auto client with: %1", eval(Profile::current[resource]:$[])); + } else { + y2milestone("logging for resource %1 turned off",resource); + y2debug("Calling auto client with: %1", eval(Profile::current[resource]:$[])); + } if (size(Profile::current[resource]:$[]) > 0 ) logStep( sformat (_("Configuring %1"), p)); else @@ -190,8 +200,12 @@ logStep( sformat (_("Configuring %1"), p)); else logStep( sformat (_("Not Configuring %1"), p)); - - y2milestone("Calling auto client with: %1", eval(Profile::current[resource]:[])); + if( d["X-SuSE-YaST-AutoLogResource"]:"true" == "true" ) { + y2milestone("Calling auto client with: %1", eval(Profile::current[resource]:$[])); + } else { + y2milestone("logging for resource %1 turned off",resource); + y2debug("Calling auto client with: %1", eval(Profile::current[resource]:$[])); + } //Call::Function(module_auto, ["Import", eval(Profile::current[resource]:[]) ]); processWait( resource, "pre-modules" ); Call::Function(module_auto, ["Write"]); Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/dialogs/partition_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/dialogs/partition_dialogs.ycp?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/dialogs/partition_dialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/dialogs/partition_dialogs.ycp Fri Sep 25 08:21:48 2009 @@ -102,13 +102,13 @@ this_drive = select (filter (map d, partitioning,``(d["device"]:"" == item)),0,$[]); new_val = $[ "partition_id" : 131, - "filesystem" : `reiser + "filesystem" : `ext3 ]; drive = item; } new_val["fsid"] = new_val["partition_id"]:Partitions::fsid_native; - new_val["used_fs"] = new_val["filesystem"]:`reiser; + new_val["used_fs"] = new_val["filesystem"]:`ext3; list<string> vgs = []; foreach( map d, partitioning, ``{ Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/include/autopart.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/include/autopart.ycp?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/include/autopart.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/include/autopart.ycp Fri Sep 25 08:21:48 2009 @@ -424,9 +424,9 @@ } p["mount"] = mount; if (e["reuse"]:false) - p["used_fs"] = solution["partitions",pindex,"filesystem"]:p["detected_fs"]:`reiser; + p["used_fs"] = solution["partitions",pindex,"filesystem"]:p["detected_fs"]:`ext3; else - p["used_fs"] = solution["partitions",pindex,"filesystem"]:`reiser; + p["used_fs"] = solution["partitions",pindex,"filesystem"]:`ext3; value = solution["partitions",pindex,"fstopt"]:""; if( size(value)>0 ) @@ -557,7 +557,7 @@ part["mountby"] = mb; } part["used_fs"] = - solution["partitions",pindex,"filesystem"]:((mount == "swap")?(`swap):(`reiser)); + solution["partitions",pindex,"filesystem"]:((mount == "swap")?(`swap):(`ext3)); value = solution["partitions",pindex,"fstopt"]:""; if( size(value)>0 ) { Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/include/conftree.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/include/conftree.ycp?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/include/conftree.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/include/conftree.ycp Fri Sep 25 08:21:48 2009 @@ -57,7 +57,11 @@ term groups( string selectedGroup ){ list<term> itemList = []; foreach(string k, map v, Y2ModuleConfig::GroupMap, { - term item = `item( `id(k),`icon(v["Icon"]:""), v["Name"]:"", k == selectedGroup ); + string desktop_file = substring( v["X-SuSE-DocTeamID"]:"", 4 ); + string translation = dpgettext("desktop_translations", "/usr/share/locale/", "Name("+desktop_file+".desktop): "+v["Name"]:"" ); + if( translation == "Name("+desktop_file+".desktop): "+v["Name"]:"" ) + translation = v["Name"]:""; + term item = `item( `id(k),`icon(v["Icon"]:""), translation, k == selectedGroup ); itemList = add(itemList, item ); }); return `SelectionBox( `id(`groups), `opt(`notify), _("Groups"), itemList ); @@ -76,15 +80,18 @@ foreach(string k , map v, Y2ModuleConfig::ModuleMap, ``{ if (v["X-SuSE-YaST-Group"]:"" == group_name) { - term item = `item( `id(k),`icon(v["Icon"]:""), v["Name"]:"", k == selectedModule ); + string desktop_file = substring( v["X-SuSE-DocTeamID"]:"", 4 ); + string translation = dpgettext("desktop_translations", "/usr/share/locale/", "Name("+desktop_file+".desktop): "+v["Name"]:"" ); + if( translation == "Name("+desktop_file+".desktop): "+v["Name"]:"" ) + translation = v["Name"]:""; + term item = `item( `id(k),`icon(v["Icon"]:""), translation, k == selectedModule ); itemList = add(itemList, item ); } }); if( 0 == size(itemList) ){ - itemList = add( itemList, `item(`id("none"), "No modules available" ) ); + itemList = add( itemList, `item(`id("none"), _("No modules available") ) ); } - map resourceMap = Y2ModuleConfig::GroupMap[group_name]:$[]; - return `SelectionBox(`id(`modules), `opt(`notify), resourceMap["Name"]:"" + " - " + _("Modules"), itemList ); + return `SelectionBox(`id(`modules), `opt(`notify), _("Modules"), itemList ); } /* Creates an `HBox containing the buttons to be displayed below the summary column @@ -122,7 +129,7 @@ string summary = (string) WFM::CallFunction( module_auto,["Summary"]); if( nil == summary ) summary = ""; - return `VBox( `Left(`Label( resourceMap["Name"]:"" + " - " + _("Details") )), + return `VBox( `Left(`Label( _("Details") )), `RichText( summary ), buttons() ); Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/include/io.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/include/io.ycp?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/include/io.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/include/io.ycp Fri Sep 25 08:21:48 2009 @@ -216,8 +216,12 @@ if( d["bus"]:"USB" == "SCSI" && haskey(d, "dev_name") ) { integer i = 0; string dev = d["dev_name"]:""; - while( SCR::Read(.target.lstat, dev) != $[] ) { - WFM::Execute(.local.mount, [ dev, mount_point ]); + while( SCR::Read(.target.lstat, dev) != $[] || i < 5 ) { + if( !(boolean)WFM::Execute(.local.mount, [ dev, mount_point ]) ) { + y2milestone("mount failed for %1", dev); + i = i + 1; + continue; + } if (WFM::Execute (.local.bash, "/bin/cp " + mount_point + "/" + Path + " " + Localfile) != 0) { y2milestone("not found on %1",dev); } else { @@ -273,7 +277,7 @@ WFM::Execute(.local.mount, [sformat("/dev/%1", Host) , mount_point]); - if (WFM::Execute (.local.bash, "/bin/cp " + mount_point + Path + " " + Localfile) != 0 ) + if (WFM::Execute (.local.bash, "/bin/cp " + mount_point + "/" + Path + " " + Localfile) != 0 ) { // autoyast tried to copy a file but that file can't be found GET_error = sformat(_("File %1 cannot be found"),mount_point + Path); Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/include/xml.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/include/xml.ycp?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/include/xml.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/include/xml.ycp Fri Sep 25 08:21:48 2009 @@ -99,7 +99,7 @@ "net-udev":"rule" ]; - doc["cdataSections"] = ["source", "info_file", "file_contents", "pxelinux-config"]; + doc["cdataSections"] = ["source", "info_file", "file_contents", "pxelinux-config", "media_url"]; // doc["systemID"] = "/usr/share/autoinstall/dtd/profile.dtd"; doc["rootElement"] = "profile"; doc["nameSpace"] = "http://www.suse.com/1.0/yast2ns"; Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/AutoinstLVM.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/AutoinstLVM.ycp?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/AutoinstLVM.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/AutoinstLVM.ycp Fri Sep 25 08:21:48 2009 @@ -299,7 +299,7 @@ y2milestone("lv = %1",lv); lv["device"] = "/dev/"+vgname+"/"+lv["lv_name"]:""; - lv["used_fs"] = this_lv["used_fs"]:`reiser; + lv["used_fs"] = this_lv["used_fs"]:`ext3; map lvret = $[]; if (lv["resize"]:false ) { @@ -311,7 +311,7 @@ "fstype" : "LV", "nr" : lv["nr"]:"", "mount" : lv["mount"]:"" , - "used_fs" : this_lv["used_fs"]:`reiser, + "used_fs" : this_lv["used_fs"]:`ext3, "format" : lv["format"]:false , "device" : lv["device"]:"" ]; @@ -324,7 +324,7 @@ } targetMap = lvret["targets"]:targetMap; } else if ( lv["create"]:true ) { - lv["used_fs"] = lv["filesystem"]:`reiser; + lv["used_fs"] = lv["filesystem"]:`ext3; lv["create"] = true; lv["format"] = lv["format"]:true; lv["device"] = "/dev/" + current_vg + "/" + lv["name"]:""; Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/AutoinstPartPlan.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/AutoinstPartPlan.ycp?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/AutoinstPartPlan.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/AutoinstPartPlan.ycp Fri Sep 25 08:21:48 2009 @@ -438,6 +438,10 @@ { new_pe["lv_name"] = pe["name"]:""; new_pe["size"] = sformat("%1", pe["size_k"]:0*1024); + if( haskey( pe, "stripes" ) ) { + new_pe["stripes"] = pe["stripes"]:0; + new_pe["stripesize"] = pe["stripesize"]:4; + } } if (haskey(pe,"used_by_type") && pe["used_by_type"]:`nothing == `UB_MD) { @@ -449,7 +453,7 @@ // detected_fs! if (haskey(pe,"used_fs") && pe["fsid"]:0 != 253) { - new_pe["filesystem"] = pe["used_fs"]:`reiser; + new_pe["filesystem"] = pe["used_fs"]:`ext3; new_pe["format"] = new_pe["format"]:pe["format"]:true; } Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/AutoinstPartition.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/AutoinstPartition.ycp?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/AutoinstPartition.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/AutoinstPartition.ycp Fri Sep 25 08:21:48 2009 @@ -42,7 +42,12 @@ "mountby" : `device, "resize" : false, "lv_name" : "", + "stripes" : 1, + "stripesize" : 4, "lvm_group" : "", + "raid_name" : "", + "raid_type" : "", + "raid_options" : $[] ]; define map allfs = $[]; @@ -206,6 +211,12 @@ newPart = set( newPart, "size", part["size"]:"" ); newPart = set( newPart, "lv_name", part["lv_name"]:"" ); newPart = set( newPart, "lvm_group", part["lvm_group"]:"" ); + newPart = set( newPart, "stripes", part["stripes"]:1 ); + newPart = set( newPart, "stripesize", part["stripesize"]:4 ); + if( part["stripes"]:1 == 1 ) { + newPart = remove( newPart, "stripes" ); + newPart = remove( newPart, "stripesize" ); + } /* partition_id enforcement */ if( haskey( part, "lvm_group" ) ){ newPart = set( newPart, "partition_id", 142 ); @@ -213,6 +224,13 @@ else if( "swap" == newPart["mount"]:"" ){ newPart = set( newPart, "partition_id", 130 ); } + if( haskey( part, "raid_name" ) ) { + newPart = set( newPart, "raid_name", part["raid_name"]:"" ); + newPart = set( newPart, "raid_type", part["raid_type"]:"raid0" ); + } + if( haskey( part, "raid_options" ) ) { + newPart = set( newPart, "raid_options", part["raid_options"]:$[] ); + } return newPart; } Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/Profile.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/Profile.ycp?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/Profile.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/Profile.ycp Fri Sep 25 08:21:48 2009 @@ -732,7 +732,7 @@ m[i] = setLValue( tmp, v, m[i]:[] ); } } else { - y2milestone("setting %1 to %2",i,v); + y2debug("setting %1 to %2",i,v); m[i] = v; } return m; @@ -748,7 +748,7 @@ m[i] = setLValue( tmp, v, m[i]:[] ); } } else { - y2milestone("setting %1 to %2",i,v); + y2debug("setting %1 to %2",i,v); m[i] = v; } return m; Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/Y2ModuleConfig.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/Y2ModuleConfig.ycp?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/Y2ModuleConfig.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/modules/Y2ModuleConfig.ycp Fri Sep 25 08:21:48 2009 @@ -51,7 +51,9 @@ "X-SuSE-YaST-AutoInstMergeTypes", "X-SuSE-YaST-AutoInstDataType", "X-SuSE-YaST-AutoInstClonable", - "X-SuSE-YaST-AutoInstRequires" + "X-SuSE-YaST-AutoInstRequires", + "X-SuSE-DocTeamID", + "X-SuSE-YaST-AutoLogResource" ]; Desktop::Read(Values); map configurations = Desktop::Modules; Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/schema/classes-use.rnc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/schema/classes-use.rnc?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/schema/classes-use.rnc (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/schema/classes-use.rnc Fri Sep 25 08:21:48 2009 @@ -15,7 +15,11 @@ class = element class { class_name & - configuration + configuration & + element dont_merge { + LIST, + element element { text }* + }? } class_name = Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/schema/rules.rnc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/schema/rules.rnc?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/schema/rules.rnc (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/schema/rules.rnc Fri Sep 25 08:21:48 2009 @@ -89,6 +89,10 @@ result = element result { profile & + element dont_merge { + LIST, + element element { text }* + }? & continue? } Modified: branches/SuSE-Code-11-SP1-Branch/backup/package/yast2-backup.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/backup/package/yast2-backup.changes?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/backup/package/yast2-backup.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/backup/package/yast2-backup.changes Fri Sep 25 08:21:48 2009 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Wed Jun 24 13:35:51 CEST 2009 - locilka@suse.cz + +- Fixed 'bytes' units in help text (bnc #513438). + +------------------------------------------------------------------- +Wed Apr 8 16:58:11 CEST 2009 - kmachalkova@suse.cz + +- Adjusted to new Nfs::Mount API (5th param specifying nfs type - + nfs[23] vs. nfs4 is required). Assuming default 'nfs' here + +------------------------------------------------------------------- Wed Jul 8 15:26:23 CEST 2009 - locilka@suse.cz - Fixed storing some additional backup information during Modified: branches/SuSE-Code-11-SP1-Branch/backup/src/Backup.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/backup/src/Backup.ycp?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/backup/src/Backup.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/backup/src/Backup.ycp Fri Sep 25 08:21:48 2009 @@ -465,7 +465,7 @@ global define boolean PrepareBackup() ``{ if (target_type == `nfs && nfsmount == nil) { - nfsmount = Nfs::Mount(nfsserver, nfsexport, nil, ""); + nfsmount = Nfs::Mount(nfsserver, nfsexport, nil, "", ""); return nfsmount != nil; } Modified: branches/SuSE-Code-11-SP1-Branch/backup/src/functions.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/backup/src/functions.ycp?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/backup/src/functions.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/backup/src/functions.ycp Fri Sep 25 08:21:48 2009 @@ -911,7 +911,7 @@ return nil; } - string mpoint = Nfs::Mount(server, share, nil, ""); + string mpoint = Nfs::Mount(server, share, nil, "", ""); if (mpoint == nil) { Modified: branches/SuSE-Code-11-SP1-Branch/backup/src/help_texts.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/backup/src/help_texts.ycp?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/backup/src/help_texts.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/backup/src/help_texts.ycp Fri Sep 25 08:21:48 2009 @@ -62,7 +62,8 @@ select <B>Custom</B>. Then enter the volume size in <b>Custom Size</b>.</P>") // For translators: help text in tar options dialog - part 3/3 - + _("<P><B>Note:</B> 1 kB=1000 Bytes, 1 kiB=1024 Bytes, etc. + // http://en.wikipedia.org/wiki/Byte + + _("<P><B>Note:</B> 1 kB=1000 bytes, 1 KiB=1024 bytes, etc. The entered volume size will be rounded down to a multiple of 2048 bytes.</P>"); } Modified: branches/SuSE-Code-11-SP1-Branch/backup/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/backup/src/ui.ycp?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/backup/src/ui.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/backup/src/ui.ycp Fri Sep 25 08:21:48 2009 @@ -649,7 +649,7 @@ if (Backup::target_type == `nfs) { - nfsdir = Nfs::Mount(Backup::nfsserver, Backup::nfsexport, nil, ""); + nfsdir = Nfs::Mount(Backup::nfsserver, Backup::nfsexport, nil, "", ""); if (nfsdir == nil) { Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes Fri Sep 25 08:21:48 2009 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Mon May 18 17:26:50 CEST 2009 - juhliarik@suse.cz + +- added fix for checking soft-raid devices in device.map + (bnc#494630) +- added fix for changing device map in y2-bootloader (bnc#497944) +- added warning message if there is not valid configuration for + soft-raid (bnc#501043) + +------------------------------------------------------------------- +Thu Apr 16 15:19:37 CEST 2009 - juhliarik@suse.cz + +- added fix for commandline interface (bnc#479069) + +------------------------------------------------------------------- Mon May 4 15:31:16 CEST 2009 - juhliarik@suse.cz - added fix for checking soft-raid devices in device.map Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/clients/bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootloader/src/clients/bootloader.ycp?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/clients/bootloader.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/clients/bootloader.ycp Fri Sep 25 08:21:48 2009 @@ -73,6 +73,7 @@ while (i < size(BootCommon::sections)) { if (BootCommon::sections[i, "name"]:"" == section) { BootCommon::sections[i, key] = value; + BootCommon::sections[i, "__changed"] = true; return true; } i = i + 1; @@ -138,6 +139,8 @@ * @return boolean true on success */ define boolean BootloaderAddHandler (map options) ``{ + if (! CommandLine::Interactive()) + CommandLine::Error(_("Add option is available only in commandline interactive mode")); string section = (string)(options["section"]:nil); if (section == nil) { @@ -217,7 +220,7 @@ "add" : $[ "handler" : BootloaderAddHandler, // command line help text for add action - "help" : _("Add a new section"), + "help" : _("Add a new section - please use interactive mode"), ], "print" : $[ "handler" : BootloaderPrintHandler, @@ -259,7 +262,6 @@ if (.noio == WFM::Args (i) || ".noio" == WFM::Args (i)) { skip_io = true; - BootCommon::save_on_finish = false; } i = i + 1; } Modified: branches/SuSE-Code-11-SP1-Branch/core/libycp/src/YCPBuiltinList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/core/libycp/src/YCPBuiltinList.cc?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/core/libycp/src/YCPBuiltinList.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/core/libycp/src/YCPBuiltinList.cc Fri Sep 25 08:21:48 2009 @@ -1349,7 +1349,7 @@ { "lsort", "list <flex> (const list <flex>)", (void *)l_lsortlist, DECL_FLEX }, { "splitstring","list <string> (string, string)", (void *)l_splitstring }, { "change", "list <flex> (const list <flex>, const flex)", (void *)l_changelist, DECL_FLEX|DECL_DEPRECATED }, - { "add", "list <flex> (const list <flex>, const flex)", (void *)l_add, DECL_FLEX }, + { "add", "list <flex> (const list <flex>, const flex)", (void *)l_add, DECL_FLEX|DECL_NIL }, { "+", "list <flex> (const list <flex>, const flex)", (void *)l_add, DECL_FLEX }, { "+", "list <any> (const list <any>, any)", (void *)l_add }, { "size", "integer (const list <any>)", (void *)l_size, DECL_NIL }, Modified: branches/SuSE-Code-11-SP1-Branch/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/core/package/yast2-core.changes?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/core/package/yast2-core.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/core/package/yast2-core.changes Fri Sep 25 08:21:48 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Apr 17 13:45:47 CEST 2009 - juhliarik@suse.cz + +- added fix for problem with adding nil to list (bnc#216177) + +------------------------------------------------------------------- Thu Aug 13 09:06:06 CEST 2009 - mvidner@suse.cz - Applied the following fixes from Factory (bnc#530260): Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes Fri Sep 25 08:21:48 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Mar 13 14:02:35 CET 2009 - locilka@suse.cz + +- Allowing IPv6 address to be used as DNS Server forwarder + (bnc #463539) + +------------------------------------------------------------------- Fri Mar 20 10:14:16 CET 2009 - locilka@suse.cz - Always including forwarders.conf in 'options' section. Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-main.ycp?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-main.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-main.ycp Fri Sep 25 08:21:48 2009 @@ -238,7 +238,7 @@ `HBox ( `HWeight ( 9, // Textentry for DNS-Forwarders adding IP - `InputField ( `id ( "forwarders_new_ip_address" ), `opt ( `hstretch ), _("IP A&ddress"), "" ) + `InputField ( `id ( "forwarders_new_ip_address" ), `opt ( `hstretch ), _("IPv4 or IPv6 A&ddress"), "" ) ), `HWeight ( 2, `Bottom ( `PushButton ( `id ( "forwarders_add_ip_address" ), `opt ( `hstretch ), Label::AddButton() ) ) @@ -313,7 +313,7 @@ */ void ValidCharsForwardersPage () { // setting `ValidChars - UI::ChangeWidget( `id("forwarders_new_ip_address"), `ValidChars, IP::ValidChars4); + UI::ChangeWidget( `id("forwarders_new_ip_address"), `ValidChars, IP::ValidChars4 + IP::ValidChars6); } void handlePolicy( symbol policy ){ @@ -437,9 +437,16 @@ { string new_addr = (string) UI::QueryWidget (`id ("forwarders_new_ip_address"), `Value); - if (! IP::Check4 (new_addr)) + // both IPv4 and IPv6 + if (! IP::Check (new_addr)) { - Report::Error (IP::Valid4 ()); + Report::Error ( + _("Invalid IPv4 or IPv6 address.") + + "\n" + + IP::Valid4 () + + _("A valid IPv6 address consists of letters a-f, numbers, +and colons.") + ); return nil; } if (contains (forwarders, new_addr)) Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/firstboot/package/yast2-firstboot.changes?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firstboot/package/yast2-firstboot.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/firstboot/package/yast2-firstboot.changes Fri Sep 25 08:21:48 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jun 1 13:02:52 CEST 2009 - jsuchome@suse.cz + +- grab texts from firstboot.xml when creating pot file (bnc#479571) +- call the X11 config to save kbd layout (bnc#497819) + +------------------------------------------------------------------- Tue Jul 7 09:50:06 CEST 2009 - jsuchome@suse.cz - start the services before YaST (bnc#475169) Modified: branches/SuSE-Code-11-SP1-Branch/http-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/http-server/VERSION?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/http-server/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/http-server/VERSION Fri Sep 25 08:21:48 2009 @@ -1 +1 @@ -2.17.5 +2.17.11 Modified: branches/SuSE-Code-11-SP1-Branch/http-server/agents/ag_http_server URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/http-server/agents/ag_http_server?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/http-server/agents/ag_http_server (original) +++ branches/SuSE-Code-11-SP1-Branch/http-server/agents/ag_http_server Fri Sep 25 08:21:48 2009 @@ -121,13 +121,16 @@ foreach my $vhost ( @$conf ) { if ($file eq 'default-server.conf'){ $hash_table{'main'} = $vhost; -# foreach my $data ( @{$vhost->{'DATA'}} ) -# { if ($data->{'KEY'} eq 'NameVirtualHost'){ $hash_table{ $data->{'VALUE'} } = []; } -# } } else { + my $key='ip-based'; + if (defined($vhost->{'VirtualByName'}) && $vhost->{'VirtualByName'} eq '1'){ + foreach my $row ( @{$vhost->{'DATA'}} ){ + $key=$row->{'VALUE'} if($row->{'KEY'} eq 'ServerName'); + } + } if (exists $vhost->{'HostIP'}){ - if ( exists $hash_table{ $vhost->{'HostIP'}} ){ push(@{$hash_table{ $vhost->{'HostIP'}}}, $vhost); } - else { push(@{$hash_table{'ip-based'}}, $vhost); } + if ( defined $hash_table{ $key} ){ push(@{$hash_table{ $key }}, $vhost); } + else { push(@{$hash_table{$key}}, $vhost); } } } } @@ -154,41 +157,6 @@ } } -#sub parse_module_selection() { -# my $class = shift; -# my $dir = Directory::vardir(); -# my $dir = "/var/lib/YaST2/"; # FIXME: calling Directory::vardir later -# my @ret = (); - -# if( open(FILE, "< $dir/httpd_active_module_selections.conf") ) { -# @ret = <FILE>; -# chomp(@ret); -# close(FILE); -# } ELse { -# return $class->SetError( summary => sprintf(_("unable to open file %s/httpd_active_module_selections.conf for reading: %s"),$dir,$!), -# code => "OPEN_FAILED" -# ); -# } - -# return \@ret; -#} - -sub write_module_selection { - my $class = shift; - my $newSelection = shift; - my $dir = "/var/lib/YaST2/"; # FIXME: calling Directory::vardir later - - if( open(FILE, "> $dir/httpd_active_module_selections.conf") ) { - print FILE join("\n",@$newSelection); - close(FILE); - } else { - return $class->SetError( summary => sprintf(_("unable to open file %s/httpd_active_module_selections.conf for writing: %s"),$dir,$!), - code => "OPEN_FAILED" - ); - } - return 1; -} - # generic apache2 configfile format parser sub sectionParser { my $keys = []; @@ -246,6 +214,11 @@ my $class = shift; my $data = shift; + # remove old files first + for my $remove ( ) { + unlink $remove; + } + foreach my $file ( keys(%{$data}) ) { next if( $file eq 'default-server.conf' ); # skip the default server here open( FILE, "> /etc/apache2/vhosts.d/$file" ) or do { @@ -411,10 +384,6 @@ } return $class->write_listen_conf(); } - } elsif( $path eq '.moduleselection' ) { - if( ref($args[0]) eq 'ARRAY' ) { - return $class->write_module_selection( $args[0] ); - } } else { # not implemented } Modified: branches/SuSE-Code-11-SP1-Branch/http-server/package/yast2-http-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/http-server/package/yast2-http-server.changes?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/http-server/package/yast2-http-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/http-server/package/yast2-http-server.changes Fri Sep 25 08:21:48 2009 @@ -1,4 +1,41 @@ ------------------------------------------------------------------- +Wed Mar 25 14:06:28 CET 2009 - mzugec@suse.cz + +- for name-based vhosts split configuration files (bnc#427427) +- 2.17.11 + +------------------------------------------------------------------- +Mon Mar 23 16:54:23 CET 2009 - mzugec@suse.de + +- improved IP addr. validation for ip-based vhosts (bnc#486476) +- 2.17.10 + +------------------------------------------------------------------- +Mon Mar 23 16:51:13 CET 2009 - mzugec@suse.de + +- correctly recognize virtual host type (IP/name) (bnc#486475) +- 2.17.9 + +------------------------------------------------------------------- +Mon Mar 23 16:43:46 CET 2009 - mzugec@suse.de + +- handling of custom modules (see bnc#482424) +- 2.17.8 + +------------------------------------------------------------------- +Mon Mar 23 16:41:22 CET 2009 - mzugec@suse.de + +- modules ordering problem (bnc#350590) +- validation of modules dependency +- 2.17.7 + +------------------------------------------------------------------- +Mon Mar 23 16:28:53 CET 2009 - mzugec@suse.de + +- added X-SuSE-YaST-AutoInstSchema into desktop file (bnc#480466) +- 2.17.6 + +------------------------------------------------------------------- Wed Nov 19 16:39:26 CET 2008 - mzugec@suse.cz - fixed Listen entry problem (bnc#445460) Modified: branches/SuSE-Code-11-SP1-Branch/http-server/src/HttpServerWidgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/http-server/src/HttpServerWidgets.ycp?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/http-server/src/HttpServerWidgets.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/http-server/src/HttpServerWidgets.ycp Fri Sep 25 08:21:48 2009 @@ -222,15 +222,14 @@ } map vhost = YaST::HTTPDData::GetVhostType(host); - if (! FileUtils::CheckAndCreatePath( documentroot )){ res = false; break; } if (vhost["id"]:"" == ip) { - // this is valid only if both of them are name-based, not ip-based - if ( YaST::HTTPDData::GetVhostType(host)["type"]:""=="name-based" && namebased ) + // this is valid only if both of them are name-based, not ip-based (bnc#486476) + if ( !(YaST::HTTPDData::GetVhostType(host)["type"]:""=="name-based" && namebased) ) { // error message - the entered ip address is already // configured for another virtual host @@ -629,6 +628,7 @@ global void initModules (string key); global symbol handleModules (string key, map event); +global boolean validateModules (string key, map event); global void initListenSettings (string key); global symbol handleListenSettings (string key, map event); global void initServiceStatus (string key); @@ -1469,6 +1469,8 @@ ), "init" : initModules, "handle" : handleModules, + "validate_type" : `function, + "validate_function" : validateModules, "help" : HELPS["modules"]:"", ], @@ -2467,7 +2469,7 @@ integer index = -1; // create temporary list of maps from modules list< map > listmodules = maplist(string name , modules,{ - return( mapmap(string k,any v, $["default":"1", "name":name, "summary":_("unknown"), "required":"0", "suggested":"0"], + return( mapmap(string k,any v, $["default":"1", "name":name, "summary":_("unknown"), "requires":""], {return ($[k:v]); })); }); // add to known modules list modules from temporary list @@ -2494,6 +2496,30 @@ UI::SetFocus (`id (`modules)); } + global boolean validateModules(string id, map key){ + boolean valid=true; + list<string> selected = []; + foreach(term i, (list<term>)UI::QueryWidget(`modules, `Items), { + if (i[2]:""==_("Enabled")) selected=add(selected, i[1]:""); + }); + map all_modules =$[]; + foreach(map row, YaST::HTTPDData::GetKnownModules(), { + all_modules[row["name"]:""] = remove(row, "name"); + }); + foreach(string mod, selected, { + string require = all_modules[mod, "requires"]:""; + if (size(require)>0){ + if (!contains(selected, require)){ + string message = sformat("%1:\n %2 %3 %4\n%5", _("Modules dependency problem"), mod, _("requires"), require, _("Enable required module or disable first one.")); + Popup::Error(message); + y2warning("Error message: %1", message); + valid=false; + } + } + }); + return valid; + } + /** * Handle function of a widget * @param key any widget key of widget that is processed @@ -2536,10 +2562,10 @@ else if (event["ID"]:nil == `add_user) { - string modules_dir=sformat("/usr/%1/apache2-%2/", (Arch::ia64()||Arch::mips64()||Arch::ppc64()||Arch::s390_64()||Arch::sparc64()||Arch::x86_64())?"lib64":"lib", (PackageSystem::Installed("apache2-prefork"))?"prefork":"worker"); + string module_dirs=sformat("/usr/lib*/apache2/ /usr/lib*/apache2-%1/", (PackageSystem::Installed("apache2-prefork"))?"prefork":"worker"); // list of all installed modules list <string> all_modules = splitstring(((map) SCR::Execute(.target.bash_output, - sformat("ls %1|grep so|cut -d. -f1|cut -d_ -f2-", modules_dir)))["stdout"]:"", "\n"); + sformat("ls %1|grep \".so$\"|cut -d. -f1|cut -d_ -f2-", module_dirs)))["stdout"]:"", "\n"); list<string> existing = maplist (map mod, YaST::HTTPDData::GetKnownModules(), ``( mod["name"]:_("unknown"))); // extract unknown modules from all installed Modified: branches/SuSE-Code-11-SP1-Branch/http-server/src/YaPI/HTTPD.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/http-server/src/YaPI/HTTPD.pm?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/http-server/src/YaPI/HTTPD.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/http-server/src/YaPI/HTTPD.pm Fri Sep 25 08:21:48 2009 @@ -526,7 +526,7 @@ if ($byname eq 0){ push(@{$vhost_files->{'ip-based'}}, {HOSTID => "$ip/$servername", HostIP => $ip, DATA => \@newdata}); } else { - $vhost_files->{$ip} = [{HOSTID => "$ip/$servername", HostIP => $ip, DATA => \@newdata}]; + $vhost_files->{$servername} = [{HOSTID => "$ip/$servername", HostIP => $ip, DATA => \@newdata}]; } @@ -556,12 +556,11 @@ } } case "main" { delete $vhost_files->{'main'} if ($hostid eq 'main'); } - else { - foreach my $hostList ( $vhost_files->{$key} ) { - foreach my $hostentryHash ( @$hostList ) { delete ($vhost_files->{$key}) if ($hostentryHash->{HOSTID} eq $hostid); } - } - } - } + else { + my $vhost = $vhost_files->{$key}->[0]->{'HOSTID'}; + delete $vhost_files->{$key} if ($vhost eq $hostid); + } + } } } @@ -898,28 +897,21 @@ sub writeHosts (){ my $self = shift; - my @vhosts = (); - @vhosts = @{$vhost_files->{'ip-based'}} if (defined $vhost_files->{'ip-based'}); + # default server + my %data = ( 'default-server.conf' =>$vhost_files->{'main'}); - foreach my $key ( keys(%{$vhost_files}) ) { - switch($key) - { - case "ip-based" { - } - case "main" {} - else { - foreach my $hostList ( $vhost_files->{$key} ) { - foreach my $hostentryHash ( @$hostList ) { - push( @vhosts, $hostentryHash ) ; - } - } - } - } - } - - my %data = ( 'default-server.conf' =>$vhost_files->{'main'}); - $data{'yast2_vhosts.conf'} = \@vhosts ; + #ip based vhost + my @ip_vhosts = @{$vhost_files->{'ip-based'}} if (defined $vhost_files->{'ip-based'}); + my $size = @ip_vhosts; + $data{'ip-based_vhosts.conf'} = \@ip_vhosts if ($size>0); + + #name based vhost + foreach my $vhost ( keys(%{$vhost_files}) ) { + next if ($vhost eq 'main' || $vhost eq 'ip-based'); + my @name_vhost = @{$vhost_files->{$vhost}}; + $data{"$vhost.conf"} = \@name_vhost; + } SCR->Write(".http_server.vhosts", \%data); } @@ -955,7 +947,9 @@ BEGIN { $TYPEINFO{GetModuleList} = ["function", [ "list", "string" ] ]; } sub GetModuleList { my $self = shift; - my $data = SCR->Read('.sysconfig.apache2.APACHE_MODULES'); # FIXME: Error handling +# my $data = SCR->Read('.sysconfig.apache2.APACHE_MODULES'); # FIXME: Error handling + my $data = SCR->Execute('.target.bash_output', 'a2enmod -l')->{'stdout'}; # FIXME: Error handling + $data =~ s/mod_//g; return [ split(/\s+/, $data) ]; @@ -1070,8 +1064,12 @@ } @newList = (@known, @unknown); - SCR->Write('.sysconfig.apache2.APACHE_MODULES', join(' ',@newList)); - SCR->Write('.sysconfig.apache2', undef); + SCR->Execute('.target.bash', 'for module in $(a2enmod -l);do a2enmod -d $module; done'); + foreach my $module (@newList){ + SCR->Execute('.target.bash', "a2enmod $module"); + } +# SCR->Write('.sysconfig.apache2.APACHE_MODULES', join(' ',@newList)); +# SCR->Write('.sysconfig.apache2', undef); return 1; } Modified: branches/SuSE-Code-11-SP1-Branch/http-server/src/YaPI/HTTPDModules.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/http-server/src/YaPI/HTTPDModules.pm?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/http-server/src/YaPI/HTTPDModules.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/http-server/src/YaPI/HTTPDModules.pm Fri Sep 25 08:21:48 2009 @@ -1,14 +1,18 @@ package YaPI::HTTPDModules; use YaPI; textdomain "http-server"; - %modules = ( +# (without_leading mod_) module name = { +# summary => __("Translatable text with module description - will be shown in YaST table"), +# packages => [ list of rpm packages needed for particular module ], +# default => 0 or 1 if this module should be enabled by default +# postition => order in /etc/sysconfig/apache2 (lowest numbew, ... , higher number) +# requires => required modulename (this is used in YaST dialog validation) +# } 'authz_host' => { summary => __("Provides access control based on client host name, IP address, etc."), packages => [], default => 1, - required => 0, - suggested => 0, position => 10, directives=> [ { option => "Allow", "context" => [ "Directory" ] }, { option => "Deny", "context" => [ "Directory" ] }, @@ -19,8 +23,6 @@ summary => __("Executing CGI scripts based on media type or request method"), packages => [], default => 1, - required => 0, - suggested => 0, position => 20, directives=> [ { option => "Action", "context" => [ "Directory", "Server", "Virtual" ] }, { option => "Script", "context" => [ "Directory", "Server", "Virtual" ] } @@ -30,8 +32,6 @@ summary => __("Mapping different parts of the host file system in the document tree and for URL redirection"), packages => [], default => 1, - required => 0, - suggested => 0, position => 30, directives=> [ { option => "Alias", "context" => [ "Server", "Virtual" ] }, { option => "AliasMatch", "context" => [ "Server", "Virtual" ] }, @@ -47,8 +47,6 @@ summary => __("Basic authentication"), packages => [], default => 1, - required => 0, - suggested => 0, position => 40, directives=> [ { option => "AuthBasicAuthoritative", "context" => [ "Directory" ] , "values" => [ "On", "Off" ] }, { option => "AuthBasicProvider", "context" => [ "Directory" ] } @@ -58,8 +56,6 @@ summary => __("User authentication using text files"), packages => [], default => 1, - required => 0, - suggested => 0, position => 40, directives=> [ { option => "AuthUserFile", "context" => [ "Directory" ] } ] @@ -68,8 +64,6 @@ summary => __("User Authorization"), packages => [], default => 1, - required => 0, - suggested => 0, position => 40, directives=> [ { option => "AuthzUserAuthoritative", "context" => [ "Directory" ], "values" => [ "On", "Off" ] } ] @@ -78,8 +72,6 @@ summary => __("Group authorization using plaintext files"), packages => [], default => 1, - required => 0, - suggested => 0, position => 40, directives=> [ { option => "AuthGroupFile", "context" => [ "Directory" ] }, { option => "AuthzGroupFileAuthoritative", "context" => [ "Directory" ], "values" => [ "On", "Off" ] } @@ -89,18 +81,12 @@ summary => __("User authentication using DBM files"), packages => [], default => 0, - required => 0, - suggested => 0, position => 50, module => { -# AuthDBMAuthoritative => 'mod_auth_dbm', -# AuthDBMGroupFile => 'mod_auth_dbm', AuthDBMType => 'mod_auth_dbm', AuthDBMUserFile => 'mod_auth_dbm' }, directives=> [ -#{ option => "AuthDBMAuthoritative", "context" => [ "Directory" ] , "values" => [ "On", "Off" ] }, -# { option => "AuthDBMGroupFile", "context" => [ "Directory" ] }, { option => "AuthDBMType", "context" => [ "Directory" ] , "values" => [ "default", "SDBM", "GDBM", "NDBM", "DB" ] }, { option => "AuthDBMUserFile", "context" => [ "Directory" ] } @@ -110,8 +96,6 @@ summary => __("Generates directory indices, automatically, similar to the Unix ls command"), packages => [], default => 1, - required => 0, - suggested => 0, position => 60, directives=> [ { option => "AddAlt", "context" => [ "Directory", "Server", "Virtual" ] }, { option => "AddAltByEncoding", "context" => [ "Directory", "Server", "Virtual" ] }, @@ -133,8 +117,6 @@ summary => __("Execution of CGI scripts"), packages => [], default => 1, - required => 0, - suggested => 0, position => 70, directives=> [ { option => "ScriptLog", "context" => [ "Server", "Virtual" ] }, { option => "ScriptLogBuffer", "context" => [ "Server", "Virtual" ] }, @@ -145,8 +127,6 @@ summary => __("Provides for trailing slash redirects and serving directory index files"), packages => [], default => 1, - required => 0, - suggested => 0, position => 80, directives=> [ { option => "DirectoryIndex", "context" => [ "Directory", "Server", "Virtual" ] }, { option => "DirectorySlash", "context" => [ "Directory", "Server", "Virtual" ] , "values" => [ "On", "Off" ] } @@ -156,8 +136,6 @@ summary => __("Modifies the environment passed to CGI scripts and SSI pages"), packages => [], default => 0, - required => 0, - suggested => 0, position => 90, directives=> [ { option => "PassEnv", "context" => [ "Directory", "Server", "Virtual" ] }, { option => "SetEnv", "context" => [ "Directory", "Server", "Virtual" ] }, @@ -168,8 +146,6 @@ summary => __("Generation of Expires HTTP headers according to user-specified criteria"), packages => [], default => 0, - required => 0, - suggested => 0, position => 100, module => { ExpiresActive => 'mod_expires', @@ -185,8 +161,6 @@ summary => __("Server-parsed HTML documents (Server Side Includes)"), packages => [], default => 1, - required => 0, - suggested => 0, position => 110, directives=> [ { option => "SSIEndTag", "context" => [ "Server", "Virtual" ] }, { option => "SSIErrorMsg", "context" => [ "Directory", "Server", "Virtual" ] }, @@ -201,8 +175,6 @@ summary => __("Logging of the requests made to the server"), packages => [], default => 1, - required => 0, - suggested => 0, position => 120, directives=> [ { option => "BufferedLogs", "context" => [ "Server" ] , "values" => [ "On", "Off" ] }, { option => "CookieLog", "context" => [ "Server", "Virtual" ] }, @@ -215,8 +187,6 @@ summary => __("Associates the requested file name\'s extensions with the file\'s behavior and content"), packages => [], default => 1, - required => 0, - suggested => 0, position => 130, directives=> [ { option => "AddCharset", "context" => [ "Directory", "Server", "Virtual" ] }, { option => "AddEncoding", "context" => [ "Directory", "Server", "Virtual" ] }, @@ -242,8 +212,6 @@ summary => __("Provides for content negotiation"), packages => [], default => 1, - required => 0, - suggested => 0, position => 140, directives=> [ { option => "CacheNegotiatedDocs", "context" => [ "Server", "Virtual" ], "values" => [ "On", "Off" ] }, { option => "ForceLanguagePriority", "context" => [ "Directory", "Server", "Virtual" ] }, @@ -254,8 +222,6 @@ summary => __("Allows the setting of environment variables based on characteristics of the request"), packages => [], default => 1, - required => 0, - suggested => 0, position => 150, directives=> [ { option => "BrowserMatch", "context" => [ "Directory", "Server", "Virtual" ] }, { option => "BrowserMatchNoCase", "context" => [ "Directory", "Server", "Virtual" ] }, @@ -267,8 +233,6 @@ summary => __("Provides information about server activity and performance"), packages => [], default => 1, - required => 0, - suggested => 0, position => 160, directives=> [ { option => "ExtendedStatus", "context" => [ "Server" ], "values" => [ "On", "Off" ] } ] @@ -277,8 +241,6 @@ summary => __("Allows CGI scripts to run as a specified user and group"), packages => [], default => 0, - required => 0, - suggested => 0, position => 0, module => { SuexecUserGroup => 'mod_suexec', @@ -290,8 +252,6 @@ summary => __("User-specific directories"), packages => [], default => 1, - required => 0, - suggested => 0, position => 180, directives=> [ { option =>"UserDir", "context" => [ "Server", "Virtual" ] } ] @@ -300,16 +260,12 @@ summary => __("Sends files that contain their own HTTP headers"), packages => [], default => 1, - required => 0, - suggested => 0, position => 190 }, 'authn_anon' => { summary => __("Allows \"anonymous\" user access to authenticated areas"), packages => [], default => 0, - required => 0, - suggested => 0, position => 200, module => { Anonymous => 'mod_auth_anon', @@ -331,8 +287,6 @@ summary => __("User authentication using MD5 Digest Authentication"), packages => [], default => 0, - required => 0, - suggested => 0, position => 210, directives=> [ { option =>"AuthDigestAlgorithm", "context" => [ "Directory" ], "values" => [ "MD5", "MD5-sess" ] }, { option =>"AuthDigestDomain", "context" => [ "Directory" ] }, @@ -348,8 +302,6 @@ summary => __("Allows an LDAP directory to be used to store the database for HTTP Basic authentication"), packages => [], default => 0, - required => 0, - suggested => 0, position => 355, directives=> [ { option =>"AuthLDAPBindDN", "context" => [ "Directory" ] }, { option =>"AuthLDAPBindPassword", "context" => [ "Directory" ] }, @@ -368,8 +320,6 @@ summary => __("Content cache keyed to URIs"), packages => [], default => 0, - required => 0, - suggested => 0, position => 230, directives=> [ { option =>"CacheDefaultExpire", "context" => [ "Server", "Virtual" ] }, { option =>"CacheDisable", "context" => [ "Server", "Virtual" ] }, @@ -387,8 +337,6 @@ summary => __("Specify character set translation or recoding"), packages => [], default => 0, - required => 0, - suggested => 0, position => 240, directives=> [ { option =>"CharsetDefault", "context" => [ "Directory", "Server", "Virtual" ] }, { option =>"CharsetOptions", "context" => [ "Directory", "Server", "Virtual" ] }, @@ -399,8 +347,6 @@ summary => __("Distributed Authoring and Versioning (WebDAV) functionality"), packages => [], default => 0, - required => 0, - suggested => 0, position => 250, module => { Dav => 'mod_dav', @@ -416,8 +362,6 @@ summary => __("File system provider for mod_dav"), packages => [], default => 0, - required => 0, - suggested => 0, position => 260, module => { DavLockDB => 'mod_dav_fs' @@ -429,8 +373,6 @@ summary => __("Compress content before it is delivered to the client"), packages => [], default => 0, - required => 0, - suggested => 0, position => 270, module => { DeflateBufferSize => 'mod_deflate', @@ -445,14 +387,11 @@ { option =>"DeflateMemLevel", "context" => [ "Server", "Virtual" ] }, { option =>"DeflateWindowSize", "context" => [ "Server", "Virtual" ] } ] - }, 'disk_cache' => { summary => __("Content cache storage manager keyed to URIs"), packages => [], default => 0, - required => 0, - suggested => 0, position => 280, directives=> [ { option =>"CacheDirLength", "context" => [ "Server", "Virtual" ] }, { option =>"CacheDirLevels", "context" => [ "Server", "Virtual" ] }, @@ -465,8 +404,6 @@ summary => __("A simple echo server to illustrate protocol modules"), packages => [], default => 0, - required => 0, - suggested => 0, position => 290, directives=> [ { option =>"ProtocolEcho", "context" => [ "Server", "Virtual" ], "values" => [ "On", "Off" ] } ] @@ -475,8 +412,6 @@ summary => __("Pass the response body through an external program before delivery to the client"), packages => [], default => 0, - required => 0, - suggested => 0, position => 300, module => { ExtFilterDefine => 'mod_ext_filter', @@ -485,26 +420,20 @@ directives=> [ { option =>"ExtFilterDefine", "context" => [ "Server" ] }, { option =>"ExtFilterOptions", "context" => [ "Directory" ] } ] - }, 'file_cache' => { summary => __("Caches a static list of files in memory"), packages => [], default => 0, - required => 0, - suggested => 0, position => 310, directives=> [ { option =>"CacheFile", "context" => [ "Server" ] }, { option =>"MMapFile", "context" => [ "Server" ] } ] - }, 'headers' => { summary => __("Customization of HTTP request and response headers"), packages => [], default => 0, - required => 0, - suggested => 0, position => 320, module => { Header => 'mod_headers', @@ -513,28 +442,22 @@ directives=> [ { option =>"Header", "context" => [ "Server", "Virtual", "Directory" ] }, { option =>"RequestHeader", "context" => [ "Server", "Virtual", "Directory" ] } ] - }, 'imagemap' => { summary => __("Server-side image map processing"), packages => [], default => 1, - required => 0, - suggested => 0, position => 330, directives=> [ { option =>"ImapBase", "context" => [ "Server", "Virtual", "Directory" ] }, { option =>"ImapDefault", "context" => [ "Server", "Virtual", "Directory" ] }, { option =>"ImapMenu", "context" => [ "Server", "Virtual", "Directory" ], "values" => [ "none", "formatted", "semiformatted", "unformatted" ] } ] - }, 'info' => { summary => __("Provides a comprehensive overview of the server configuration"), packages => [], default => 0, - required => 0, - suggested => 0, position => 340, module => { AddModuleInfo => 'mod_info' }, directives=> [ { option =>"AddModuleInfo", "context" => [ "Server", "Virtual" ] }, @@ -544,8 +467,6 @@ summary => __("LDAP connection pooling and result caching services for use by other LDAP modules"), packages => [], default => 0, - required => 0, - suggested => 0, position => 350, directives=> [ { option =>"LDAPCacheEntries", "context" => [ "Server" ] }, { option =>"LDAPCacheTTL", "context" => [ "Server" ] }, @@ -566,16 +487,12 @@ summary => __("Logging of input and output bytes per request"), packages => [], default => 0, - required => 0, - suggested => 0, position => 360 }, 'mem_cache' => { summary => __("Content cache keyed to URIs"), packages => [], default => 0, - required => 0, - suggested => 0, position => 370, directives=> [ { option =>"MCacheMaxObjectCount", "context" => [ "Server" ] }, { option =>"MCacheMaxObjectSize", "context" => [ "Server" ] }, @@ -589,20 +506,15 @@ summary => __("Determines the MIME type of a file by looking at a few bytes of its contents"), packages => [], default => 0, - required => 0, - suggested => 0, position => 380, module => { MimeMagicFile => 'mod_mime_magic' }, directives=> [ { option =>"MimeMagicFile", "context" => [ "Server", "Virtual" ] }, ] - }, 'proxy' => { summary => __("HTTP/1.1 proxy/gateway server"), packages => [], default => 0, - required => 0, - suggested => 0, position => 390, module => { NoProxy => 'mod_proxy', @@ -646,14 +558,11 @@ { option =>"ProxyVia", "context" => [ "Server", "Virtual" ], "values" => [ "On", "Off", "Full", "Block" ] } ] - }, 'proxy_connect' => { summary => __("mod_proxy extension for CONNECT request handling"), packages => [], default => 0, - required => 0, - suggested => 0, position => 400, module => { AllowCONNECT => 'mod_proxy_connect' } }, @@ -661,24 +570,18 @@ summary => __("FTP support module for mod_proxy"), packages => [], default => 0, - required => 0, - suggested => 0, position => 410 }, 'proxy_http' => { summary => __("HTTP support module for mod_proxy"), packages => [], default => 0, - required => 0, - suggested => 0, position => 420 }, 'rewrite' => { summary => __("Provides a rule-based rewriting engine to rewrite requested URLs on the fly"), packages => [], default => 0, - required => 0, - suggested => 0, position => 430, module => { RewriteBase => 'mod_rewrite', @@ -701,26 +604,20 @@ { option =>"RewriteOptions", "context" => [ "Server", "Virtual", "Directory" ] }, { option =>"RewriteRule", "context" => [ "Server", "Virtual", "Directory" ] } ] - }, 'speling' => { summary => __("Attempts to correct mistaken URLs that users might have entered"), packages => [], default => 0, - required => 0, - suggested => 0, position => 440, module => { CheckSpelling => 'mod_speling' }, directives=> [ { option =>"CheckSpelling", "context" => [ "Server", "Virtual", "Directory" ], "values" => [ "On", "Off" ] }, ] - }, 'ssl' => { summary => __("Strong cryptography using the Secure Sockets Layer (SSL) and Transport Layer Security (TLS) protocols"), packages => [], default => 0, - required => 0, - suggested => 0, position => 450, directives=> [ { option =>"SSLCACertificateFile", "context" => [ "SSL", "Server", "Virtual" ] }, { option =>"SSLCACertificatePath", "context" => [ "SSL", "Server", "Virtual" ] }, @@ -761,16 +658,12 @@ summary => __("Provides an environment variable with a unique identifier for each request"), packages => [], default => 0, - required => 0, - suggested => 0, position => 460 }, 'usertrack' => { summary => __("Clickstream logging of user activity on a site"), packages => [], default => 0, - required => 0, - suggested => 0, position => 470, module => { CookieDomain => 'mod_usertrack', @@ -791,8 +684,6 @@ summary => __("Provides support for dynamically configured mass virtual hosting"), packages => [], default => 0, - required => 0, - suggested => 0, position => 480, module => { VirtualDocumentRoot => 'mod_vhost_alias', @@ -806,54 +697,45 @@ { option =>"VirtualScriptAliasIP", "context" => [ "Server", "Virtual", "Directory" ] } ] }, - -# 'php4' => { -# summary => 'Provides support for PHP4 dynamically generated pages', -# packages => ["apache2-mod_php4"], -# default => 0, -# required => 0, -# suggested => 0, -# position => 490, -# exclude => [ "php5" ] -# }, - 'php5' => { summary => __("Provides support for PHP5 dynamically generated pages"), packages => ["apache2-mod_php5"], default => 0, - required => 0, - suggested => 0, - position => 490, - exclude => [ "php4" ] + position => 490 }, 'perl' => { summary => __("Provides support for Perl dynamically generated pages"), packages => ["apache2-mod_perl"], default => 0, - required => 0, - suggested => 0, position => 500 }, 'python' => { summary => __("Provides support for Python dynamically generated pages"), packages => ["apache2-mod_python"], default => 0, - required => 0, - suggested => 0, position => 510 }, 'apparmor' => { summary => __("Provides support for AppArmor subprocess confinement within apache"), packages => ["mod-apparmor"], default => 0, - required => 0, - suggested => 0, position => 530 + }, + 'dav_svn' => { + summary => __("Provides support for subversion"), + packages => ["subversion-server"], + requires => "dav", + default => 0, + position => 540 + }, + 'authz_svn' => { + summary => __("Provides support for subversion"), + packages => ["subversion-server"], + requires => "dav_svn", + default => 0, + position => 550 } - ); - - %selection = ( TestSel => { summary => 'A test selection', @@ -861,4 +743,3 @@ default => 0 } ); - Modified: branches/SuSE-Code-11-SP1-Branch/http-server/src/http-server.desktop URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/http-server/src/http-server.desktop?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/http-server/src/http-server.desktop (original) +++ branches/SuSE-Code-11-SP1-Branch/http-server/src/http-server.desktop Fri Sep 25 08:21:48 2009 @@ -16,6 +16,7 @@ X-SuSE-YaST-SortKey= X-SuSE-YaST-AutoInstResource=http-server X-SuSE-YaST-AutoInstClonable=true +X-SuSE-YaST-AutoInstSchema = http-server.rnc Icon=yast-http-server Exec=/sbin/yast2 http-server Modified: branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLED.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLED.xml?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLED.xml (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLED.xml Fri Sep 25 08:21:48 2009 @@ -91,17 +91,6 @@ <!-- #449128, Run online-update during AC --> <module>you</module> <module>restore_settings</module> - <!-- #469273, Second stage of Upgrade: Some steps are disabled due to AC enabled --> - <module>upgrade_ask_net_test</module> - <module>upgrade_do_net_test</module> - <module>upgrade_addon_update_sources</module> - <module>upgrade_suse_register</module> - <module>upgrade_ask_online_update</module> - <module>upgrade_you</module> - <module>upgrade_restore_settings</module> - <module>upgrade_suseconfig</module> - <module>upgrade_release_notes</module> - <module>upgrade_congratulate</module> <!-- Configuration for inst_automatic_configuration script --> @@ -701,6 +690,15 @@ <proposal>initial</proposal> </module> <!-- + BNC #414490, #477778: Updating SLES 10 (hdX) to SLES 11 (sdX) + produces multiple identical grub boot menu entries + --> + <module> + <label>Perform Update</label> + <name>bl_preupdate</name> + <execute>bootloader_preupdate</execute> + </module> + <!-- FATE #303860: Provide consistent progress during installation BNC #438848: Also during upgrade --> Modified: branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLES.xml?rev=58763&r1=58762&r2=58763&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLES.xml (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/control/control.SLES.xml Fri Sep 25 08:21:48 2009 @@ -830,6 +830,15 @@ <execute>inst_proposal</execute> <proposal>initial</proposal> </module> + <!-- + BNC #414490, #477778: Updating SLES 10 (hdX) to SLES 11 (sdX) + produces multiple identical grub boot menu entries + --> + <module> + <label>Perform Update</label> + <name>bl_preupdate</name> + <execute>bootloader_preupdate</execute> + </module> Reply