October 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r52595 - /trunk/storage/libstorage/src/DmmultipathCo.cc
by aschnell＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: aschnell Date: Mon Oct 27 16:10:58 2008 New Revision: 52595 URL: http://svn.opensuse.org/viewcvs/yast?rev=52595&view=rev Log: - shorter code Modified: trunk/storage/libstorage/src/DmmultipathCo.cc Modified: trunk/storage/libstorage/src/DmmultipathCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dmmultipa… ============================================================================== --- trunk/storage/libstorage/src/DmmultipathCo.cc (original) +++ trunk/storage/libstorage/src/DmmultipathCo.cc Mon Oct 27 16:10:58 2008 @@ -146,8 +146,7 @@ c.execute(MULTIPATHBIN " -F"); } - if (lvm_active) - LvmVg::activate(true); + LvmVg::activate(lvm_active); active = val; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52594 - /tags/stable-2_17_19/autoinstallation/
by ug＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: ug Date: Mon Oct 27 15:56:39 2008 New Revision: 52594 URL: http://svn.opensuse.org/viewcvs/yast?rev=52594&view=rev Log: Created tag stable-2_17_19 for autoinstallation Added: tags/stable-2_17_19/autoinstallation/ - copied from r52593, trunk/autoinstallation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52593 - in /trunk/autoinstallation: VERSION package/autoyast2.changes src/clients/inst_autosetup.ycp
by ug＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: ug Date: Mon Oct 27 15:53:54 2008 New Revision: 52593 URL: http://svn.opensuse.org/viewcvs/yast?rev=52593&view=rev Log: kdump support fixed. 2.17.19 Modified: trunk/autoinstallation/VERSION trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/clients/inst_autosetup.ycp Modified: trunk/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/VERSION?rev=525… ============================================================================== --- trunk/autoinstallation/VERSION (original) +++ trunk/autoinstallation/VERSION Mon Oct 27 15:53:54 2008 @@ -1 +1 @@ -2.17.18 +2.17.19 Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Mon Oct 27 15:53:54 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Oct 27 15:52:44 CET 2008 - ug(a)suse.de + +- added kdump support +- 2.17.19 + +------------------------------------------------------------------- Fri Oct 24 10:44:38 CEST 2008 - ug(a)suse.de - workaround for missing "REQUIRES" in content file to stay Modified: trunk/autoinstallation/src/clients/inst_autosetup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/ins… ============================================================================== --- trunk/autoinstallation/src/clients/inst_autosetup.ycp (original) +++ trunk/autoinstallation/src/clients/inst_autosetup.ycp Mon Oct 27 15:53:54 2008 @@ -260,6 +260,9 @@ Bootloader::Propose (); y2debug ("autoyast: Proposing done"); + // SLES only + if( haskey(Profile::current, "kdump") ) + Call::Function("kdump_auto", ["Import", Profile::current["kdump"]:$[] ]); LanUdevAuto::Import(Profile::current["networking"]:$[]); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52592 - /tags/stable-2_17_45/storage/
by aschnell＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: aschnell Date: Mon Oct 27 15:41:29 2008 New Revision: 52592 URL: http://svn.opensuse.org/viewcvs/yast?rev=52592&view=rev Log: Created tag stable-2_17_45 for storage Added: tags/stable-2_17_45/storage/ - copied from r52591, trunk/storage/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52591 - /trunk/storage/package/yast2-storage.changes
by aschnell＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: aschnell Date: Mon Oct 27 15:17:24 2008 New Revision: 52591 URL: http://svn.opensuse.org/viewcvs/yast?rev=52591&view=rev Log: - added entry Modified: trunk/storage/package/yast2-storage.changes Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Oct 27 15:17:24 2008 @@ -3,6 +3,7 @@ - provide simple interface to activate multipath if yast2-multipath is not available (bnc #438055) +- deactivate lvm while activating multipath (bnc #438061) - 2.17.45 ------------------------------------------------------------------- -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52590 - in /trunk/installation: control/control.SLES.xml package/yast2-installation.changes
by locilka＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: locilka Date: Mon Oct 27 15:13:17 2008 New Revision: 52590 URL: http://svn.opensuse.org/viewcvs/yast?rev=52590&view=rev Log: - Added 'kdump' to 'clone_modules' (SLES) (bnc #436365). Modified: trunk/installation/control/control.SLES.xml trunk/installation/package/yast2-installation.changes Modified: trunk/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLE… ============================================================================== --- trunk/installation/control/control.SLES.xml (original) +++ trunk/installation/control/control.SLES.xml Mon Oct 27 15:13:17 2008 @@ -216,6 +216,7 @@ <clone_module>software</clone_module> <clone_module>partitioning</clone_module> <clone_module>bootloader</clone_module> + <clone_module>kdump</clone_module> </clone_modules> <texts> Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Oct 27 15:13:17 2008 @@ -9,6 +9,7 @@ - Disabling users and auth in LiveCD second stage (bnc #435965). - Removing label for user_non_interactive (bnc #401319). - Desktop 'startkde4' replaced with 'startkde' (bnc #438212). +- Added 'kdump' to 'clone_modules' (SLES) (bnc #436365). ------------------------------------------------------------------- Tue Oct 21 16:46:00 CEST 2008 - locilka(a)suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52589 - in /trunk/storage: ./ libstorage/src/ package/ storage/src/ storage/src/include/ storage/src/modules/
by aschnell＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: aschnell Date: Mon Oct 27 15:08:31 2008 New Revision: 52589 URL: http://svn.opensuse.org/viewcvs/yast?rev=52589&view=rev Log: - provide simple interface to activate multipath if yast2-multipath is not available (bnc #438055) Added: trunk/storage/storage/src/multipath-simple.ycp Modified: trunk/storage/libstorage/src/Dm.h trunk/storage/libstorage/src/DmmultipathCo.cc trunk/storage/libstorage/src/DmmultipathCo.h trunk/storage/libstorage/src/LvmVg.h trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Storage.h trunk/storage/libstorage/src/StorageInterface.h trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/Makefile.am trunk/storage/storage/src/include/ep-hd.ycp trunk/storage/storage/src/modules/Storage.ycp trunk/storage/yast2-storage.spec.in Modified: trunk/storage/libstorage/src/Dm.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dm.h?rev=… ============================================================================== --- trunk/storage/libstorage/src/Dm.h (original) +++ trunk/storage/libstorage/src/Dm.h Mon Oct 27 15:08:31 2008 @@ -51,6 +51,8 @@ static bool notDeleted( const Dm& l ) { return( !l.deleted() ); } static void activate( bool val=true ); + static bool isActive() { return active; } + static string devToTable( const string& dev ); static string dmName( const string& table ); static int dmNumber( const string& table ); Modified: trunk/storage/libstorage/src/DmmultipathCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dmmultipa… ============================================================================== --- trunk/storage/libstorage/src/DmmultipathCo.cc (original) +++ trunk/storage/libstorage/src/DmmultipathCo.cc Mon Oct 27 15:08:31 2008 @@ -130,10 +130,14 @@ if (active != val) { + bool lvm_active = LvmVg::isActive(); + LvmVg::activate(false); + SystemCmd c; if (val) { Dm::activate(true); + c.execute(MODPROBEBIN " dm-multipath"); c.execute(MULTIPATHBIN); } @@ -141,6 +145,10 @@ { c.execute(MULTIPATHBIN " -F"); } + + if (lvm_active) + LvmVg::activate(true); + active = val; } } @@ -154,8 +162,6 @@ SystemCmd c(MULTIPATHBIN " -d -v 2+ -ll"); if (c.numLines() > 0) { - active = true; - string line; unsigned i=0; @@ -194,6 +200,9 @@ l.push_back(unit); } } + + if (!l.empty()) + active = true; } y2mil("detected multipaths " << l); Modified: trunk/storage/libstorage/src/DmmultipathCo.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dmmultipa… ============================================================================== --- trunk/storage/libstorage/src/DmmultipathCo.h (original) +++ trunk/storage/libstorage/src/DmmultipathCo.h Mon Oct 27 15:08:31 2008 @@ -96,7 +96,8 @@ static string undevName( const string& name ); static void activate( bool val=true ); - static bool getActive() { return active; } + static bool isActive() { return active; } + static void getMultipaths( std::list<string>& l ); static bool multipathNotDeleted( const Dmmultipath&d ) { return( !d.deleted() ); } Modified: trunk/storage/libstorage/src/LvmVg.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LvmVg.h?r… ============================================================================== --- trunk/storage/libstorage/src/LvmVg.h (original) +++ trunk/storage/libstorage/src/LvmVg.h Mon Oct 27 15:08:31 2008 @@ -53,10 +53,11 @@ void logDifference( const Container& rhs ) const; static void activate( bool val=true ); + static bool isActive() { return active; } + static void getVgs( std::list<string>& l ); static bool lvNotDeleted( const LvmLv& l ) { return( !l.deleted() ); } - protected: // iterators over LVM LVs // protected typedefs for iterators over LVMLVs Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Mon Oct 27 15:08:31 2008 @@ -5684,15 +5684,6 @@ } -bool -Storage::getMultipathActive() -{ - bool ret = DmmultipathCo::getActive(); - y2mil("ret:" << ret); - return ret; -} - - int Storage::addFstabEntry( const string& device, const string& mount, const string& vfs, const string& options, unsigned freq, unsigned passno ) Modified: trunk/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.h… ============================================================================== --- trunk/storage/libstorage/src/Storage.h (original) +++ trunk/storage/libstorage/src/Storage.h Mon Oct 27 15:08:31 2008 @@ -463,7 +463,6 @@ void handleHald( bool stop ); void activateHld( bool val=true ); void activateMultipath( bool val=true ); - bool getMultipathActive(); void removeDmTableTo( const Volume& vol ); void removeDmTableTo( const string& device ); bool removeDmTable( const string& table ); Modified: trunk/storage/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageIn… ============================================================================== --- trunk/storage/libstorage/src/StorageInterface.h (original) +++ trunk/storage/libstorage/src/StorageInterface.h Mon Oct 27 15:08:31 2008 @@ -2084,13 +2084,6 @@ virtual void activateMultipath( bool val ) = 0; /** - * Query whether multipath is active or not. - * - * @return bool multipath active state - */ - virtual bool getMultipathActive() = 0; - - /** * Rescan all disks. * All currently detected objects are forgotten and a new scan * for all type of objects (disks, LVM, MD) is initiated. Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Oct 27 15:08:31 2008 @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Mon Oct 27 11:54:55 CET 2008 - aschnell(a)suse.de -- allow querying of multipath state (needed for bnc #438055) +- provide simple interface to activate multipath if yast2-multipath + is not available (bnc #438055) - 2.17.45 ------------------------------------------------------------------- Modified: trunk/storage/storage/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/Makefile.am?… ============================================================================== --- trunk/storage/storage/src/Makefile.am (original) +++ trunk/storage/storage/src/Makefile.am Mon Oct 27 15:08:31 2008 @@ -1,21 +1,20 @@ # # Makefile.am for storage/src # -# $Id$ -# SUBDIRS = include modules proposal -client_DATA = \ - inst_custom_part.ycp \ - inst_disk.ycp \ - inst_do_resize.ycp \ - inst_disk_proposal.ycp \ - inst_prepdisk.ycp \ - inst_resize_ui.ycp \ - inst_target_part.ycp \ - inst_target_selection.ycp \ - storage_finish.ycp +client_DATA = \ + inst_custom_part.ycp \ + inst_disk.ycp \ + inst_do_resize.ycp \ + inst_disk_proposal.ycp \ + inst_prepdisk.ycp \ + inst_resize_ui.ycp \ + inst_target_part.ycp \ + inst_target_selection.ycp \ + storage_finish.ycp \ + multipath-simple.ycp EXTRA_DIST = $(client_DATA) Modified: trunk/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd.ycp (original) +++ trunk/storage/storage/src/include/ep-hd.ycp Mon Oct 27 15:08:31 2008 @@ -63,7 +63,7 @@ configs = add(configs, `item(`id(`iscsi), _("Configure &iSCSI..."))); } - if (IsAvailable("multipath")) { + if (true) { // menu entry text configs = add(configs, `item(`id(`multipath), _("Configure &Multipath..."))); } @@ -164,9 +164,14 @@ break; case `multipath: - // popup text - CallConfig(_("Calling Multipath configuration cancels all current changes. + if (WFM::ClientExists("multipath")) + // popup text + CallConfig(_("Calling Multipath configuration cancels all current changes. Really call Multipath configuration?"), ["yast2-multipath"], "multipath"); + else + // popup text + CallConfig(_("Calling Multipath configuration cancels all current changes. +Really call Multipath configuration?"), nil, "multipath-simple"); break; case `dasd: Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Mon Oct 27 15:08:31 2008 @@ -4747,14 +4747,6 @@ } -global boolean GetMultipathActive() -{ - boolean ret = LibStorage::StorageInterface::getMultipathActive(sint); - y2milestone("GetMultipathActive ret:%1", ret); - return ret; -} - - /** * Writes fstab to the disk */ Added: trunk/storage/storage/src/multipath-simple.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/multipath-si… ============================================================================== --- trunk/storage/storage/src/multipath-simple.ycp (added) +++ trunk/storage/storage/src/multipath-simple.ycp Mon Oct 27 15:08:31 2008 @@ -0,0 +1,12 @@ +{ + textdomain "storage"; + + import "Popup"; + import "Storage"; + + boolean activate = Popup::YesNo(_("Activate multipath?")); + + Storage::ActivateMultipath(activate); + + return true; +} Modified: trunk/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?re… ============================================================================== --- trunk/storage/yast2-storage.spec.in (original) +++ trunk/storage/yast2-storage.spec.in Mon Oct 27 15:08:31 2008 @@ -61,6 +61,7 @@ @clientdir@/partitions_proposal.ycp @clientdir@/disk.ycp @clientdir@/disk_worker.ycp +@clientdir@/multipath-simple.ycp @moduledir@/* @fillupdir@/sysconfig.storage -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52588 - in /trunk/sudo/src: dialog-cmnd.ycp dialog-host.ycp dialog-runas.ycp dialog-user.ycp
by kmachalkova＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: kmachalkova Date: Mon Oct 27 14:20:03 2008 New Revision: 52588 URL: http://svn.opensuse.org/viewcvs/yast?rev=52588&view=rev Log: Make it more clear that only capital letters are allowed (#395779) Modified: trunk/sudo/src/dialog-cmnd.ycp trunk/sudo/src/dialog-host.ycp trunk/sudo/src/dialog-runas.ycp trunk/sudo/src/dialog-user.ycp Modified: trunk/sudo/src/dialog-cmnd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/dialog-cmnd.ycp?rev=525… ============================================================================== --- trunk/sudo/src/dialog-cmnd.ycp (original) +++ trunk/sudo/src/dialog-cmnd.ycp Mon Oct 27 14:20:03 2008 @@ -33,7 +33,7 @@ } term contents = `VBox ( - `TextEntry(`id("cmnd_alias_name"),_("Alias Name")), + `TextEntry(`id("cmnd_alias_name"),_("Alias Name (in CAPITALS)")), `Left(`Label(_("Command Names or Directories in the Alias"))), `Table(`id("cmnd_alias_members"),`header( _("Command"), Modified: trunk/sudo/src/dialog-host.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/dialog-host.ycp?rev=525… ============================================================================== --- trunk/sudo/src/dialog-host.ycp (original) +++ trunk/sudo/src/dialog-host.ycp Mon Oct 27 14:20:03 2008 @@ -37,7 +37,7 @@ } term contents = `VBox ( - `TextEntry(`id("host_alias_name"),_("Alias Name")), + `TextEntry(`id("host_alias_name"),_("Alias Name (in CAPITALS)")), `Left(`Label(_("Hostnames or Networks in the Alias"))), `Table(`id("host_alias_members"),`header("Host Names/Networks"),[]), `Left(`HBox( Modified: trunk/sudo/src/dialog-runas.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/dialog-runas.ycp?rev=52… ============================================================================== --- trunk/sudo/src/dialog-runas.ycp (original) +++ trunk/sudo/src/dialog-runas.ycp Mon Oct 27 14:20:03 2008 @@ -43,7 +43,7 @@ } term contents = `VBox ( - `TextEntry(`id("runas_alias_name"),_("Alias Name")), + `TextEntry(`id("runas_alias_name"),_("Alias Name (in CAPITALS)")), `VSpacing(1), `HBox( `VBox( Modified: trunk/sudo/src/dialog-user.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/dialog-user.ycp?rev=525… ============================================================================== --- trunk/sudo/src/dialog-user.ycp (original) +++ trunk/sudo/src/dialog-user.ycp Mon Oct 27 14:20:03 2008 @@ -43,7 +43,7 @@ } term contents = `VBox ( - `TextEntry(`id("user_alias_name"),_("Alias Name")), + `TextEntry(`id("user_alias_name"),_("Alias Name (in CAPITALS)")), `VSpacing(1), `HBox( `VBox( -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52587 - in /trunk/packager: package/yast2-packager.changes src/clients/inst_sw_select.ycp src/modules/Packages.ycp
by locilka＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: locilka Date: Mon Oct 27 14:17:35 2008 New Revision: 52587 URL: http://svn.opensuse.org/viewcvs/yast?rev=52587&view=rev Log: - Reporting an error if software proposal cache is invalid (bnc #436925). Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/inst_sw_select.ycp trunk/packager/src/modules/Packages.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Mon Oct 27 14:17:35 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Oct 27 14:04:11 CET 2008 - locilka(a)suse.cz + +- Reporting an error if software proposal cache is invalid + (bnc #436925). + +------------------------------------------------------------------- Thu Oct 23 06:01:53 CEST 2008 - lslezak(a)suse.cz - properly select kernel packages (bnc#437258) Modified: trunk/packager/src/clients/inst_sw_select.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_sw_sel… ============================================================================== --- trunk/packager/src/clients/inst_sw_select.ycp (original) +++ trunk/packager/src/clients/inst_sw_select.ycp Mon Oct 27 14:17:35 2008 @@ -36,6 +36,10 @@ if ( ret == `accept ) { + // Package proposal cache has to be reset and recreated + // from scratch. See BNC #436925. + Packages::ResetProposalCache(); + Packages::base_selection_modified = true; ret = `next; Packages::solve_errors = 0; // all have been either solved Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.yc… ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Mon Oct 27 14:17:35 2008 @@ -66,13 +66,15 @@ // cache for the proposed summary map cached_proposal = nil; + // the selection used for the cached proposal -list<string> cached_proposal_packages = []; -list<map> cached_proposal_patterns = []; -list<map> cached_proposal_products = []; -list<map> cached_proposal_patches = []; -list<map> cached_proposal_selections = []; -list<string> cached_proposal_languages = []; +// the default values 'nil' say that the proposal hasn't been called yet +list <string> cached_proposal_packages = nil; +list <map> cached_proposal_patterns = nil; +list <map> cached_proposal_products = nil; +list <map> cached_proposal_patches = nil; +list <map> cached_proposal_selections = nil; +list <string> cached_proposal_languages = nil; global boolean install_sources = false; // Installing source packages ? global integer timestamp = 0; // last time of getting the target map @@ -117,6 +119,17 @@ // summary functions +global void ResetProposalCache () { + y2milestone ("Reseting the software proposal cache"); + + cached_proposal_packages = nil; + cached_proposal_patterns = nil; + cached_proposal_products = nil; + cached_proposal_patches = nil; + cached_proposal_selections = nil; + cached_proposal_languages = nil; +} + /** * List selected resolvables of specified kind * @param what symbol specifying the kind of resolvables to select @@ -1612,6 +1625,10 @@ full_repropose = false; } + if (force_reset) { + ResetProposalCache(); + } + // if the cache is valid and reset or reinitialization is not required // then the cached proposal can be used if (cached_proposal != nil && force_reset == false && reinit == false) @@ -1643,9 +1660,19 @@ y2milestone("using cached software proposal"); return cached_proposal; } - else - { - y2milestone("invalid cache: the software selection has been chaged"); + // do not show the error message during the first proposal + // (and the only way to change to software selection manually -> software_proposal/AskUser) + // + // 'nil' is the default value + // See also ResetProposalCache() + else if (cached_proposal_packages != nil && cached_proposal_patterns != nil + && cached_proposal_products != nil && cached_proposal_patches != nil + && cached_proposal_selections != nil && cached_proposal_languages != nil) + { + y2error("invalid cache: the software selection has been chaged"); + // bnc #436925 + Report::Error (_("The software selection has been changed externally. +Software proposal will be called again.")); } } else -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r52586 - in /trunk/sudo/src: dialog-cmnd.ycp dialog-host.ycp dialog-runas.ycp dialog-spec.ycp dialog-user.ycp dialogs.ycp
by kmachalkova＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: kmachalkova Date: Mon Oct 27 14:11:49 2008 New Revision: 52586 URL: http://svn.opensuse.org/viewcvs/yast?rev=52586&view=rev Log: Comply to styleguide: align Add/Edit/Delete trio to the left, s/Remove/Delete/g (#438227) Modified: trunk/sudo/src/dialog-cmnd.ycp trunk/sudo/src/dialog-host.ycp trunk/sudo/src/dialog-runas.ycp trunk/sudo/src/dialog-spec.ycp trunk/sudo/src/dialog-user.ycp trunk/sudo/src/dialogs.ycp Modified: trunk/sudo/src/dialog-cmnd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/dialog-cmnd.ycp?rev=525… ============================================================================== --- trunk/sudo/src/dialog-cmnd.ycp (original) +++ trunk/sudo/src/dialog-cmnd.ycp Mon Oct 27 14:11:49 2008 @@ -40,11 +40,11 @@ _("Parameters") ), [] ), - `HBox( + `Left(`HBox( `PushButton ( `id ( "add_command" ), `opt(`key_F3), " " + Label::AddButton() + " "), `PushButton ( `id ( "edit_command" ), `opt(`key_F4), " " + Label::EditButton() + " "), - `PushButton ( `id ( "remove_command" ), `opt(`key_F5), " " + Label::RemoveButton() + " ") - ) + `PushButton ( `id ( "remove_command" ), `opt(`key_F5), " " + Label::DeleteButton() + " ") + )) ); Wizard::SetContentsButtons(caption, contents,HELPS["command_alias"]:"",Label::BackButton(), Label::OKButton()); Modified: trunk/sudo/src/dialog-host.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/dialog-host.ycp?rev=525… ============================================================================== --- trunk/sudo/src/dialog-host.ycp (original) +++ trunk/sudo/src/dialog-host.ycp Mon Oct 27 14:11:49 2008 @@ -40,11 +40,11 @@ `TextEntry(`id("host_alias_name"),_("Alias Name")), `Left(`Label(_("Hostnames or Networks in the Alias"))), `Table(`id("host_alias_members"),`header("Host Names/Networks"),[]), - `HBox( + `Left(`HBox( `PushButton ( `id ( "add_host" ), `opt(`key_F3), " " + Label::AddButton() + " "), `PushButton ( `id ( "edit_host" ), `opt(`key_F4), " " + Label::EditButton() + " "), - `PushButton ( `id ( "remove_host" ), `opt(`key_F5), " " + Label::RemoveButton() + " ") - ) + `PushButton ( `id ( "remove_host" ), `opt(`key_F5), " " + Label::DeleteButton() + " ") + )) ); Wizard::SetContentsButtons(caption, contents, HELPS["host_alias"]:"",Label::BackButton(), Label::OKButton()); Modified: trunk/sudo/src/dialog-runas.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/dialog-runas.ycp?rev=52… ============================================================================== --- trunk/sudo/src/dialog-runas.ycp (original) +++ trunk/sudo/src/dialog-runas.ycp Mon Oct 27 14:11:49 2008 @@ -57,7 +57,7 @@ `VBox ( `VSpacing(1.1), `PushButton ( `id ( "add_member" ), `opt ( `hstretch, `key_F3), " " + Label::AddButton() + " "), - `PushButton ( `id ( "remove_member" ), `opt ( `hstretch , `key_F5), " " + Label::RemoveButton() + " "), + `PushButton ( `id ( "remove_member" ), `opt ( `hstretch , `key_F5), " " + Label::DeleteButton() + " "), `Empty(`opt(`vstretch)) ) ) Modified: trunk/sudo/src/dialog-spec.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/dialog-spec.ycp?rev=525… ============================================================================== --- trunk/sudo/src/dialog-spec.ycp (original) +++ trunk/sudo/src/dialog-spec.ycp Mon Oct 27 14:11:49 2008 @@ -55,11 +55,11 @@ `Label(_("Commands to Run")) ), `Table(`id("commands"),`header(_("Command"), _("Parameters")),[]), - `HBox( + `Left(`HBox( `PushButton ( `id ( "command_add" ), `opt(`key_F3), " " + Label::AddButton() + " "), `PushButton ( `id ( "command_edit" ), `opt(`key_F4), " " + Label::EditButton() + " "), - `PushButton ( `id ( "command_remove" ), `opt(`key_F5), " " + Label::RemoveButton() + " ") - ) + `PushButton ( `id ( "command_remove" ), `opt(`key_F5), " " + Label::DeleteButton() + " ") + )) ); Modified: trunk/sudo/src/dialog-user.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/dialog-user.ycp?rev=525… ============================================================================== --- trunk/sudo/src/dialog-user.ycp (original) +++ trunk/sudo/src/dialog-user.ycp Mon Oct 27 14:11:49 2008 @@ -57,7 +57,7 @@ `VBox ( `VSpacing(1.1), `PushButton ( `id ( "add_member" ), `opt ( `hstretch, `key_F3 ), " " + Label::AddButton() + " "), - `PushButton ( `id ( "remove_member" ), `opt ( `hstretch, `key_F5 ), " " + Label::RemoveButton() + " "), + `PushButton ( `id ( "remove_member" ), `opt ( `hstretch, `key_F5 ), " " + Label::DeleteButton() + " "), `Empty(`opt(`vstretch)) ) ) Modified: trunk/sudo/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/dialogs.ycp?rev=52586&r… ============================================================================== --- trunk/sudo/src/dialogs.ycp (original) +++ trunk/sudo/src/dialogs.ycp Mon Oct 27 14:11:49 2008 @@ -315,11 +315,11 @@ _("Commands") ), [] ), - `HBox ( + `Left(`HBox ( `PushButton(`id("add_spec"), `opt(`key_F3), " " + Label::AddButton() + " "), `PushButton(`id("edit_spec"), `opt(`key_F4), " " + Label::EditButton() + " "), `PushButton(`id("delete_spec"),`opt(`key_F5), " " + Label::DeleteButton() + " ") - ) + )) ), "caption" : sudo_caption + ": " + _("Rules for sudo"), "tree_item_label" : _("Rules for sudo "), @@ -334,11 +334,11 @@ _("Members") ), [] ), - `HBox ( + `Left(`HBox ( `PushButton(`id("add_user_alias"), `opt(`key_F3), " " + Label::AddButton() + " "), `PushButton(`id("edit_user_alias"), `opt(`key_F4), " " + Label::EditButton() + " "), `PushButton(`id("delete_user_alias"), `opt(`key_F5), " " + Label::DeleteButton() + " ") - ) + )) ), "caption" : sudo_caption + ": " + _("User Aliases"), @@ -354,11 +354,11 @@ _("Members") ), [] ), - `HBox ( + `Left(`HBox ( `PushButton(`id("add_runas_alias"), `opt(`key_F3), " " + Label::AddButton() + " "), `PushButton(`id("edit_runas_alias"), `opt(`key_F4), " " + Label::EditButton() + " "), `PushButton(`id("delete_runas_alias"), `opt(`key_F5), " " + Label::DeleteButton() + " ") - ) + )) ), "caption" : sudo_caption + ": " + _("RunAs Aliases"), @@ -374,11 +374,11 @@ _("Hosts") ), [] ), - `HBox ( + `Left(`HBox ( `PushButton(`id("add_host_alias"), `opt(`key_F3), " " + Label::AddButton() + " "), `PushButton(`id("edit_host_alias"), `opt(`key_F4), " " + Label::EditButton() + " "), `PushButton(`id("delete_host_alias"), `opt(`key_F5), " " + Label::DeleteButton() + " ") - ) + )) ), "caption" : sudo_caption + ": " + _("Host Aliases"), @@ -394,11 +394,11 @@ _("Commands") ), [] ), - `HBox ( + `Left(`HBox ( `PushButton(`id("add_command_alias"), `opt(`key_F3), " " + Label::AddButton() + " "), `PushButton(`id("edit_command_alias"), `opt(`key_F4), " " + Label::EditButton() + " "), `PushButton(`id("delete_command_alias"), `opt(`key_F5), " " + Label::DeleteButton() + " ") - ) + )) ), "caption" : sudo_caption + ": " + _("Command Aliases"), -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0