Hello community, here is the log from the commit of package yast2-packager checked in at Mon Oct 30 18:04:14 CET 2006. -------- --- yast2-packager/yast2-packager.changes 2006-10-24 13:37:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2006-10-30 17:26:35.000000000 +0100 @@ -1,0 +2,25 @@ +Mon Oct 30 15:37:20 CET 2006 - lslezak@suse.cz + +- do not show hidden patterns in the installation proposal +- 2.14.0 + +------------------------------------------------------------------- +Mon Oct 30 12:46:38 CET 2006 - locilka@suse.cz + +- Moving ProductFeatures::Save() to save_config_finish.ycp + (bugzilla #209119). +- Create SourceManager::InstallationSourceOnPartition function that + returns the disk partition used as installation source (if any). +- Calling Storage::RemoveDmMapsTo (device) in the begining of + inst_rpmcopy (#208222). +- Fixed include path for packager (/packager). +- Added RPM dependency on yast2-rpm. + +------------------------------------------------------------------- +Tue Oct 24 15:39:46 CEST 2006 - mvidner@suse.cz + +- If ZMD is not installed, do not complain about not being able + to start it (#214588). +- 2.13.158 + +------------------------------------------------------------------- Old: ---- yast2-packager-2.13.157.tar.bz2 New: ---- yast2-packager-2.14.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.cWuUDO/_old 2006-10-30 18:03:52.000000000 +0100 +++ /var/tmp/diff_new_pack.cWuUDO/_new 2006-10-30 18:03:52.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.13.157) +# spec file for package yast2-packager (Version 2.14.0) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-packager -Version: 2.13.157 +Version: 2.14.0 Release: 1 License: GNU General Public License (GPL) - all versions Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.13.157.tar.bz2 +Source0: yast2-packager-2.14.0.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-slp yast2-testsuite yast2-xml Requires: checkmedia yast2-country @@ -24,6 +24,7 @@ Requires: yast2-pkg-bindings >= 2.13.99 # Linuxrc::display_ip Requires: yast2 >= 2.13.67 +Requires: yast2-storage Provides: yast2-config-package-manager Obsoletes: yast2-config-package-manager Provides: y2t_spkg y2t_inst-packages y2pkginf y2c_spkg @@ -45,7 +46,7 @@ Arvin Schnell <arvin@suse.de> %prep -%setup -n yast2-packager-2.13.157 +%setup -n yast2-packager-2.14.0 %build %{prefix}/bin/y2tool y2autoconf @@ -72,9 +73,10 @@ %defattr(-,root,root) %dir /usr/share/YaST2/include/checkmedia %dir /usr/share/YaST2/include/dirinstall -/usr/share/YaST2/include/inst_source_dialogs.ycp +%dir /usr/share/YaST2/include/packager /usr/share/YaST2/include/checkmedia/* /usr/share/YaST2/include/dirinstall/* +/usr/share/YaST2/include/packager/* /usr/share/YaST2/clients/*.ycp /usr/share/YaST2/modules/* %{prefix}/share/applications/YaST2/*.desktop @@ -82,6 +84,22 @@ %doc %{prefix}/share/doc/packages/yast2-packager %changelog -n yast2-packager +* Mon Oct 30 2006 - lslezak@suse.cz +- do not show hidden patterns in the installation proposal +- 2.14.0 +* Mon Oct 30 2006 - locilka@suse.cz +- Moving ProductFeatures::Save() to save_config_finish.ycp + (bugzilla #209119). +- Create SourceManager::InstallationSourceOnPartition function that + returns the disk partition used as installation source (if any). +- Calling Storage::RemoveDmMapsTo (device) in the begining of + inst_rpmcopy (#208222). +- Fixed include path for packager (/packager). +- Added RPM dependency on yast2-rpm. +* Tue Oct 24 2006 - mvidner@suse.cz +- If ZMD is not installed, do not complain about not being able + to start it (#214588). +- 2.13.158 * Tue Oct 24 2006 - lslezak@suse.cz - Fixed SourceProgressCallback() return value (do not abort) (#213628) ++++++ yast2-packager-2.13.157.tar.bz2 -> yast2-packager-2.14.0.tar.bz2 ++++++ ++++ 5735 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.157/Makefile.am.common new/yast2-packager-2.14.0/Makefile.am.common --- old/yast2-packager-2.13.157/Makefile.am.common 2006-10-24 13:32:30.000000000 +0200 +++ new/yast2-packager-2.14.0/Makefile.am.common 2006-10-30 17:21:22.000000000 +0100 @@ -29,19 +29,7 @@ dist-hook: check-syntax -CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) - @if test "$(client_DATA)"; then \ - if $(CHECK_SYNTAX); then \ - TO_CHECK="$(filter %.ycp,$^)"; \ - echo "Checking syntax of $${TO_CHECK}"; \ - if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ - echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ - exit 1; \ - fi; \ - else \ - echo "Syntax check disabled"; \ - fi; \ - fi + if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi -include .dep diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.157/VERSION new/yast2-packager-2.14.0/VERSION --- old/yast2-packager-2.13.157/VERSION 2006-10-24 13:27:24.000000000 +0200 +++ new/yast2-packager-2.14.0/VERSION 2006-10-30 17:26:24.000000000 +0100 @@ -1 +1 @@ -2.13.157 +2.14.0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.157/configure.in new/yast2-packager-2.14.0/configure.in --- old/yast2-packager-2.13.157/configure.in 2006-10-24 13:32:30.000000000 +0200 +++ new/yast2-packager-2.14.0/configure.in 2006-10-30 17:21:22.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-packager dnl -dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.13.157, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.13.158, http://bugs.opensuse.org/, yast2-packager) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.157" +VERSION="2.13.158" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.157/src/clients/inst_kickoff.ycp new/yast2-packager-2.14.0/src/clients/inst_kickoff.ycp --- old/yast2-packager-2.13.157/src/clients/inst_kickoff.ycp 2006-10-19 11:23:58.000000000 +0200 +++ new/yast2-packager-2.14.0/src/clients/inst_kickoff.ycp 2006-10-30 14:56:37.000000000 +0100 @@ -24,7 +24,6 @@ import "Kernel"; import "Arch"; import "FileUtils"; - import "ProductFeatures"; import "String"; void AcpiToInitrd () { @@ -398,14 +397,5 @@ SCR::Execute (.target.bash, "/bin/echo \"/etc/nothing\" >/proc/sys/kernel/modprobe"); } - if (Stage::initial ()) - { - ProductFeatures::Save(); - WFM::Execute (.local.bash, sformat ( - "/bin/mkdir -p '%1/etc/YaST2'", String::Quote (Installation::destdir))); - WFM::Execute (.local.bash, sformat ( - "/bin/cp '%1' '%2/%1'", "/etc/YaST2/ProductFeatures", String::Quote (Installation::destdir))); - } - return `next; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.157/src/clients/inst_rpmcopy.ycp new/yast2-packager-2.14.0/src/clients/inst_rpmcopy.ycp --- old/yast2-packager-2.13.157/src/clients/inst_rpmcopy.ycp 2006-10-19 13:04:49.000000000 +0200 +++ new/yast2-packager-2.14.0/src/clients/inst_rpmcopy.ycp 2006-10-30 16:08:52.000000000 +0100 @@ -13,7 +13,7 @@ * Packages module : * "installed" * - * $Id: inst_rpmcopy.ycp 33515 2006-10-19 11:04:46Z lslezak $ + * $Id: inst_rpmcopy.ycp 33854 2006-10-30 15:08:50Z locilka $ */ { @@ -38,6 +38,8 @@ import "Linuxrc"; import "String"; + include "packager/storage_include.ycp"; + // variables related to installation source caching /** @@ -775,6 +777,9 @@ // end of commit installation functions // ------------------------------------------------------------------------------------------------------ + // bugzilla #208222 + ReleaseHDDUsedAsInstallationSource(); + Pkg::SetLocale (Language::language); SlideShow::SetLanguage (Language::language); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.157/src/clients/inst_source.ycp new/yast2-packager-2.14.0/src/clients/inst_source.ycp --- old/yast2-packager-2.13.157/src/clients/inst_source.ycp 2006-10-24 13:27:08.000000000 +0200 +++ new/yast2-packager-2.14.0/src/clients/inst_source.ycp 2006-10-30 15:55:58.000000000 +0100 @@ -54,7 +54,7 @@ // is initialized import "Product"; - include "inst_source_dialogs.ycp"; + include "packager/inst_source_dialogs.ycp"; integer numSources = 0; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.157/src/include/Makefile.am new/yast2-packager-2.14.0/src/include/Makefile.am --- old/yast2-packager-2.13.157/src/include/Makefile.am 2005-03-11 17:59:15.000000000 +0100 +++ new/yast2-packager-2.14.0/src/include/Makefile.am 2006-10-30 15:57:15.000000000 +0100 @@ -3,10 +3,11 @@ # SUBDIRS = checkmedia dirinstall -yncludedir = @yncludedir@/ +yncludedir = @yncludedir@/packager ynclude_DATA = \ - inst_source_dialogs.ycp + inst_source_dialogs.ycp \ + storage_include.ycp EXTRA_DIST = $(ynclude_DATA) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.157/src/include/storage_include.ycp new/yast2-packager-2.14.0/src/include/storage_include.ycp --- old/yast2-packager-2.13.157/src/include/storage_include.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-2.14.0/src/include/storage_include.ycp 2006-10-30 15:40:51.000000000 +0100 @@ -0,0 +1,28 @@ +/** + * File: include/packager/storage_include.ycp + * Module: Packager + * Summary: Storage calls + * Authors: Lukas Ocilka <locilka@suse.cz> + * + */ +{ + textdomain "installation"; + + import "Storage"; + import "SourceManager"; + + /** + * Function releases the the device when EVMS is used and the install + * source is disk. See bugzilla 208222 for more details. + */ + void ReleaseHDDUsedAsInstallationSource () { + string install_src_partition = SourceManager::InstallationSourceOnPartition(); + if (install_src_partition != "") { + if (! regexpmatch(install_src_partition, "/dev/")) + install_src_partition = sformat ("/dev/%1", install_src_partition); + + y2milestone ("Calling Storage::RemoveDmMapsTo(%1)", install_src_partition); + Storage::RemoveDmMapsTo (install_src_partition); + } + } +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.157/src/modules/Packages.ycp new/yast2-packager-2.14.0/src/modules/Packages.ycp --- old/yast2-packager-2.13.157/src/modules/Packages.ycp 2006-10-13 11:12:09.000000000 +0200 +++ new/yast2-packager-2.14.0/src/modules/Packages.ycp 2006-10-30 16:46:19.000000000 +0100 @@ -3,7 +3,7 @@ * Package: Package selections * Authors: Anas Nashif <nashif@suse.de> * - * $Id: Packages.ycp 33383 2006-10-13 09:12:02Z lslezak $ + * $Id: Packages.ycp 33851 2006-10-30 14:41:31Z lslezak $ */ { @@ -117,6 +117,15 @@ if (format == "" || format == nil) format = "%1"; list<map<string,any> > selected = Pkg::ResolvableProperties ("", what, ""); + + // ignore hidden patterns + if (what == `pattern) + { + selected = filter (map<string,any> r, selected, { + return r["user_visible"]:nil == true; + }); + } + selected = filter (map<string,any> r, selected, { return r["status"]:nil == `selected; }); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.157/src/modules/SourceManager.ycp new/yast2-packager-2.14.0/src/modules/SourceManager.ycp --- old/yast2-packager-2.13.157/src/modules/SourceManager.ycp 2006-10-13 11:12:09.000000000 +0200 +++ new/yast2-packager-2.14.0/src/modules/SourceManager.ycp 2006-10-30 15:04:37.000000000 +0100 @@ -7,7 +7,7 @@ * Martin Vidner <mvidner@suse.cz> * Status: Work in Progress * - * $Id: SourceManager.ycp 33383 2006-10-13 09:12:02Z lslezak $ + * $Id: SourceManager.ycp 33847 2006-10-30 14:04:35Z locilka $ * * Representation of the configuration of source-manager. * Input and output routines. @@ -33,6 +33,7 @@ import "String"; import "SuSEFirewall"; import "SourceManagerSLP"; +import "Linuxrc"; global list<integer> newSources = []; @@ -1003,6 +1004,13 @@ */ map ZMDStart () { map zmd_handle = $[]; + // #214588: don't complain if it is not installed + boolean installed = (integer) SCR::Read (.target.size, zmd_service_name) > 0; + if (! installed) { + y2milestone ("ZMD is not installed"); + return $[ "was_running": false, "is_running": false ]; + } + boolean running = CheckZMDStatus (); zmd_handle ["was_running"] = running; if (! running) { @@ -1300,6 +1308,8 @@ Lock (); map zmd_handle = ZMDStart (); + boolean zmd_working = ZMDWorking (zmd_handle); + ResetKnownServiceCache (); // add the sources. @@ -1322,7 +1332,7 @@ if (todel != -1) { y2milestone ("deleting the old copy, source %1", todel); - if (!is_nu) + if (!is_nu && zmd_working) { AddOrDeleteZYPPServiceIntoZMD (todel, false); } @@ -1335,7 +1345,7 @@ if (toadd != -1 && toadd != nil) { ret = add (ret, url); // #180820#c26 - if (!is_nu) + if (!is_nu && zmd_working) { AddOrDeleteZYPPServiceIntoZMD (toadd, true); } @@ -1412,5 +1422,34 @@ UI::CloseDialog (); return ret == `cont; } + +/** + * Function returns the partiton name which is used as a source for the installation + * (IF any partition is used as a source for installation, of course). + * Otherwise it returns an empty string "". See bugzilla #208222 for more information. + * + * @return string partition name + */ +global string InstallationSourceOnPartition () { + string install_mode = Linuxrc::InstallInf ("InstMode"); + + // Hard Disk is used for the installation + if (install_mode == "hd") { + string install_partition = Linuxrc::InstallInf ("Partition"); + + // No partiton is defined - error + if (install_partition == "" || install_partition == nil) { + y2error ("Despite the fact that the install-mode is '%1', install-partition is '%2'", + install_mode, install_partition + ); + return ""; + } else { + return install_partition; + } + } else { + return ""; + } +} + /* EOF */ } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.157/src/modules/test.ycp new/yast2-packager-2.14.0/src/modules/test.ycp --- old/yast2-packager-2.13.157/src/modules/test.ycp 2005-11-02 13:29:02.000000000 +0100 +++ new/yast2-packager-2.14.0/src/modules/test.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,58 +0,0 @@ - -{ - import "Package"; - import "CommandLine"; - - textdomain "test"; - - boolean startHandler(map<string,string> opts) { - Package::InstallAll(["samba-doc", "qt3-devel-doc"]); -// Package::InstallAll(["sambadocdfdfdf"]); - - return true; - } - - symbol GUIhandler() { - y2milestone("GUIhandler"); - return `next; - } - - boolean Read() { - return true; - } - - boolean Write() { - return true; - } - - map cmdline = $[ - // help text - "help" : _("Start installation in a virtual machine"), - "id" : "vm", - "guihandler": GUIhandler, - "initialize": Read, - "finish" : Write, - "actions" : $[ - "start" : $[ - // command description - "help" : _("Start installation"), - "handler" : startHandler - ] - ], - "options" : $[ - "configured" : $[ - // option description - "help" : _("List only configured devices") - ], - "all" : $[ - // option description - "help" : _("List all detected IDE devices") - ] - ], - "mappings" : $[ - "start" : ["configured", "all"], - ] - ]; - - any ret = CommandLine::Run(cmdline); -} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org