February 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55485 - /trunk/update/src/modules/RootPart.ycp
by aschnell＠svn.opensuse.org 12 Feb '09

12 Feb '09

Author: aschnell Date: Thu Feb 12 21:53:52 2009 New Revision: 55485 URL: http://svn.opensuse.org/viewcvs/yast?rev=55485&view=rev Log: - added missing import Modified: trunk/update/src/modules/RootPart.ycp Modified: trunk/update/src/modules/RootPart.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/modules/RootPart.ycp?… ============================================================================== --- trunk/update/src/modules/RootPart.ycp (original) +++ trunk/update/src/modules/RootPart.ycp Thu Feb 12 21:53:52 2009 @@ -29,6 +29,7 @@ import "Report"; import "Label"; import "Stage"; + import "Wizard"; include "partitioning/custom_part_dialogs.ycp"; -- 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] r55484 - in /trunk/autoinstallation/src: dialogs/partition_dialogs.ycp include/autopart.ycp modules/AutoinstRAID.ycp modules/AutoinstStorage.ycp
by aschnell＠svn.opensuse.org 12 Feb '09

12 Feb '09

Author: aschnell Date: Thu Feb 12 21:46:31 2009 New Revision: 55484 URL: http://svn.opensuse.org/viewcvs/yast?rev=55484&view=rev Log: - some import and include cleanup Modified: trunk/autoinstallation/src/dialogs/partition_dialogs.ycp trunk/autoinstallation/src/include/autopart.ycp trunk/autoinstallation/src/modules/AutoinstRAID.ycp trunk/autoinstallation/src/modules/AutoinstStorage.ycp Modified: trunk/autoinstallation/src/dialogs/partition_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/dialogs/par… ============================================================================== --- trunk/autoinstallation/src/dialogs/partition_dialogs.ycp (original) +++ trunk/autoinstallation/src/dialogs/partition_dialogs.ycp Thu Feb 12 21:46:31 2009 @@ -24,7 +24,6 @@ include "partitioning/custom_part_helptexts.ycp"; include "partitioning/custom_part_lib.ycp"; - include "partitioning/partition_defines.ycp"; include "autoinstall/helps.ycp"; Modified: trunk/autoinstallation/src/include/autopart.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/aut… ============================================================================== --- trunk/autoinstallation/src/include/autopart.ycp (original) +++ trunk/autoinstallation/src/include/autopart.ycp Thu Feb 12 21:46:31 2009 @@ -7,9 +7,7 @@ textdomain "autoinst"; import "FileSystems"; - - include "partitioning/partition_defines.ycp"; - + import "Arch"; map get_gap_info( map disk, map pd, boolean add_exist_linux ); Modified: trunk/autoinstallation/src/modules/AutoinstRAID.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstRAID.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstRAID.ycp Thu Feb 12 21:46:31 2009 @@ -15,7 +15,6 @@ import "Partitions"; import "AutoinstStorage"; - include "partitioning/partition_defines.ycp"; include "partitioning/raid_lib.ycp"; Modified: trunk/autoinstallation/src/modules/AutoinstStorage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstStorage.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstStorage.ycp Thu Feb 12 21:46:31 2009 @@ -19,12 +19,11 @@ import "Partitions"; import "Popup"; import "Report"; + import "Mode"; // All shared data are in yast2.rpm to break cyclic dependencies import "AutoinstData"; - include "partitioning/partition_defines.ycp"; - // Read existing fstab and format partitions, but dont create anything // Use same mountpoints etc. global boolean read_fstab = false; -- 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] r55483 - /trunk/storage/storage/src/proposal/partitions_proposal.ycp
by aschnell＠svn.opensuse.org 12 Feb '09

12 Feb '09

Author: aschnell Date: Thu Feb 12 21:17:11 2009 New Revision: 55483 URL: http://svn.opensuse.org/viewcvs/yast?rev=55483&view=rev Log: - some import and include cleanup Modified: trunk/storage/storage/src/proposal/partitions_proposal.ycp Modified: trunk/storage/storage/src/proposal/partitions_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/proposal/par… ============================================================================== --- trunk/storage/storage/src/proposal/partitions_proposal.ycp (original) +++ trunk/storage/storage/src/proposal/partitions_proposal.ycp Thu Feb 12 21:17:11 2009 @@ -14,6 +14,7 @@ import "Arch"; import "PackagesProposal"; + import "Wizard"; include "wizard/sequencer.ycp"; include "partitioning/do_proposal_flexible.ycp"; -- 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] r55482 - /trunk/storage/storage/src/include/lvm_lv_lib.ycp
by aschnell＠svn.opensuse.org 12 Feb '09

12 Feb '09

Author: aschnell Date: Thu Feb 12 21:15:53 2009 New Revision: 55482 URL: http://svn.opensuse.org/viewcvs/yast?rev=55482&view=rev Log: - some import and include cleanup Modified: trunk/storage/storage/src/include/lvm_lv_lib.ycp Modified: trunk/storage/storage/src/include/lvm_lv_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_lv_lib.ycp (original) +++ trunk/storage/storage/src/include/lvm_lv_lib.ycp Thu Feb 12 21:15:53 2009 @@ -31,6 +31,7 @@ textdomain "storage"; import "Storage"; import "Partitions"; +import "Popup"; include "partitioning/lvm_lib.ycp"; include "partitioning/lvm_pv_lib.ycp"; -- 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] r55481 - in /trunk/storage/storage/src: include/partition_defines.ycp inst_resize_ui.ycp
by aschnell＠svn.opensuse.org 12 Feb '09

12 Feb '09

Author: aschnell Date: Thu Feb 12 21:14:09 2009 New Revision: 55481 URL: http://svn.opensuse.org/viewcvs/yast?rev=55481&view=rev Log: - some import and include cleanup Modified: trunk/storage/storage/src/include/partition_defines.ycp trunk/storage/storage/src/inst_resize_ui.ycp Modified: trunk/storage/storage/src/include/partition_defines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/part… ============================================================================== --- trunk/storage/storage/src/include/partition_defines.ycp (original) +++ trunk/storage/storage/src/include/partition_defines.ycp Thu Feb 12 21:14:09 2009 @@ -17,18 +17,8 @@ */ { - import "Arch"; - import "Installation"; - import "Wizard"; - import "Storage"; import "Mode"; - import "Stage"; - import "Partitions"; import "FileSystems"; - import "Report"; - import "String"; - import "Popup"; - textdomain "storage"; Modified: trunk/storage/storage/src/inst_resize_ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_resize_… ============================================================================== --- trunk/storage/storage/src/inst_resize_ui.ycp (original) +++ trunk/storage/storage/src/inst_resize_ui.ycp Thu Feb 12 21:14:09 2009 @@ -20,6 +20,8 @@ import "Partitions"; import "Wizard"; import "Product"; + import "Installation"; + include "partitioning/do_proposal_flexible.ycp"; -- 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] r55480 - /tags/branch-Code-11-2_17_18/online-update/
by jsuchome＠svn.opensuse.org 12 Feb '09

12 Feb '09

Author: jsuchome Date: Thu Feb 12 18:59:31 2009 New Revision: 55480 URL: http://svn.opensuse.org/viewcvs/yast?rev=55480&view=rev Log: Created tag branch-Code-11-2_17_18 for online-update Added: tags/branch-Code-11-2_17_18/online-update/ - copied from r55479, branches/SuSE-Code-11-Branch/online-update/ -- 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] r55479 - in /branches/SuSE-Code-11-Branch/online-update: VERSION package/yast2-online-update.changes src/inst_you.ycp
by jsuchome＠svn.opensuse.org 12 Feb '09

12 Feb '09

Author: jsuchome Date: Thu Feb 12 18:59:24 2009 New Revision: 55479 URL: http://svn.opensuse.org/viewcvs/yast?rev=55479&view=rev Log: - solver should be called earlier (correct fix for bnc #474601) - 2.17.18 Modified: branches/SuSE-Code-11-Branch/online-update/VERSION branches/SuSE-Code-11-Branch/online-update/package/yast2-online-update.changes branches/SuSE-Code-11-Branch/online-update/src/inst_you.ycp Modified: branches/SuSE-Code-11-Branch/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/online-up… ============================================================================== --- branches/SuSE-Code-11-Branch/online-update/VERSION (original) +++ branches/SuSE-Code-11-Branch/online-update/VERSION Thu Feb 12 18:59:24 2009 @@ -1 +1 @@ -2.17.17 +2.17.18 Modified: branches/SuSE-Code-11-Branch/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/online-up… ============================================================================== --- branches/SuSE-Code-11-Branch/online-update/package/yast2-online-update.changes (original) +++ branches/SuSE-Code-11-Branch/online-update/package/yast2-online-update.changes Thu Feb 12 18:59:24 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 12 14:56:38 CET 2009 - jsuchome(a)suse.cz + +- solver should be called earlier (correct fix for bnc #474601) +- 2.17.18 + +------------------------------------------------------------------- Wed Feb 11 17:47:24 CET 2009 - locilka(a)suse.cz - Calling solver if some patches are selected during second stage Modified: branches/SuSE-Code-11-Branch/online-update/src/inst_you.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/online-up… ============================================================================== --- branches/SuSE-Code-11-Branch/online-update/src/inst_you.ycp (original) +++ branches/SuSE-Code-11-Branch/online-update/src/inst_you.ycp Thu Feb 12 18:59:24 2009 @@ -137,7 +137,9 @@ "ignoreAlreadyRecommended" : true, "onlyRequires" : true ]); - boolean solved = Pkg::PkgSolve (true); + + // first solver run, so preselecting works well + Pkg::PkgSolve (true); // select the patches affecting pkg management selected = Pkg::ResolvablePreselectPatches (`affects_pkg_manager); @@ -154,6 +156,9 @@ y2milestone ("All preselected patches: %1", selected); } + // solver must be run also after preselection (bnc#474601) + boolean solved = Pkg::PkgSolve (true); + // run package selector to allow user interaction if (!solved || ProductFeatures::GetBooleanFeature("globals", "manual_online_update") || @@ -287,20 +292,6 @@ } } - // BNC #474601, Solver run after selecting patches is required - if (! Pkg::PkgSolve (true)) - { - y2warning ("Cannot solve automatically, user decision required"); - - symbol ret_sel = PackagesUI::RunPackageSelector($["mode":`youMode]); - if (ret_sel == `cancel) - { - y2milestone ("package selector canceled -> `next"); - Pkg::SetSolverFlags (solver_flags_backup); - return `next; - } - } - // install the patches OnlineUpdateCallbacks::RegisterOnlineUpdateCallbacks(); WFM::call( "online_update_install" ); -- 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] r55478 - in /trunk/ncurses-pkg/src: NCPackageSelector.cc NCPackageSelector.h NCPkgMenuConfig.cc
by kmachalkova＠svn.opensuse.org 12 Feb '09

12 Feb '09

Author: kmachalkova Date: Thu Feb 12 18:55:07 2009 New Revision: 55478 URL: http://svn.opensuse.org/viewcvs/yast?rev=55478&view=rev Log: read sysconfig Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc trunk/ncurses-pkg/src/NCPackageSelector.h trunk/ncurses-pkg/src/NCPkgMenuConfig.cc Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.cc (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.cc Thu Feb 12 18:55:07 2009 @@ -55,10 +55,13 @@ #include "NCZypp.h" // tryCastToZyppPkg(), tryCastToZyppPatch() #include <zypp/ui/Selectable.h> +#include <zypp/base/Sysconfig.h> #include "YWidgetID.h" #include "YPackageSelector.h" +#define PATH_TO_YAST_SYSCONFIG "/etc/sysconfig/yast2" + typedef zypp::Patch::Contents ZyppPatchContents; typedef zypp::Patch::Contents::Selectable_iterator ZyppPatchContentsIterator; @@ -90,8 +93,8 @@ , pkgList ( 0 ) , depsMenu( 0 ) , viewMenu( 0 ) - , extrasMenu( 0 ) , configMenu( 0 ) + , extrasMenu( 0 ) , helpMenu( 0 ) , filterMain( 0 ) , actionMenu( 0 ) @@ -110,6 +113,7 @@ { setFlags( modeFlags ); + readSysconfig(); saveState (); diskspacePopup = new NCPkgDiskspace( testMode ); @@ -139,6 +143,20 @@ } +void NCPackageSelector::readSysconfig() +{ + map <string, string> sysconfig = zypp::base::sysconfig::read( PATH_TO_YAST_SYSCONFIG ); + map <string,string>::const_iterator it = sysconfig.find("PKGMGR_ACTION_AT_EXIT"); + + if (it != sysconfig.end()) + { + actionAtExit = it->second; + yuiMilestone() << "Read sysconfig's action at pkg mgr exit value: " << actionAtExit << endl; + } + else + yuiMilestone() << "Smolicek pacholicek" << endl; +} + bool NCPackageSelector::checkNow( bool *ok ) { bool ret = false; Modified: trunk/ncurses-pkg/src/NCPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.h (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.h Thu Feb 12 18:55:07 2009 @@ -121,6 +121,8 @@ bool testMode; // testing bool repoMgrEnabled; bool autoCheck; + + string actionAtExit; YRpmGroupsTree * _rpmGroupsTree; // rpm groups of the found packages @@ -193,6 +195,8 @@ void setFlags( long modeFlags); + void readSysconfig(); + /** * Create layout for the PackageSelector * @param parent Parent is PackageSelectorStart @@ -232,6 +236,8 @@ bool checkNow( bool *ok ); bool verifySystem( bool *ok ); + string ActionAtExit() { return actionAtExit; } + /** * Fills the package table with YOU patches matching the filter * @param filter Modified: trunk/ncurses-pkg/src/NCPkgMenuConfig.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuConfig.… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuConfig.cc (original) +++ trunk/ncurses-pkg/src/NCPkgMenuConfig.cc Thu Feb 12 18:55:07 2009 @@ -24,6 +24,10 @@ /* Textdomain "ncurses-pkg" */ +string preselect( string s1, string s2) +{ + return (s1 == s2) ? "[x] " : "[ ] "; +} NCPkgMenuConfig::NCPkgMenuConfig (YWidget *parent, string label, NCPackageSelector *pkger) : NCMenuButton( parent, label) @@ -39,6 +43,8 @@ void NCPkgMenuConfig::createLayout() { + string exitAction = pkg->ActionAtExit(); + repoManager = new YMenuItem( _( "Launch Repository Manager") ); onlineUpdate = new YMenuItem( _( "Launch Online Update Configuration" ) ); actionOnExit = new YMenuItem( _( "Action on Exit" ) ); @@ -47,9 +53,11 @@ items.push_back( onlineUpdate ); items.push_back( actionOnExit ); - restart = new YMenuItem( actionOnExit, _( "[x] Close Package Manager" ) ); - close = new YMenuItem( actionOnExit, _( "[ ] Restart Package Manager" ) ); - showSummary = new YMenuItem( actionOnExit, _( "[ ] Show Summary" ) ); + restart = new YMenuItem( actionOnExit, preselect("restart", exitAction) + _( "Close Package Manager" ) ); + close = new YMenuItem( actionOnExit, preselect("close", exitAction) + _( "Restart Package Manager" ) ); + showSummary = new YMenuItem( actionOnExit, preselect("summary", exitAction) + _( "Show Summary" ) ); + + addItems( items ); -- 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] r55477 - /tags/branch-Code-11-2_17_10/gtk/
by mkudlvasr＠svn.opensuse.org 12 Feb '09

12 Feb '09

Author: mkudlvasr Date: Thu Feb 12 18:41:59 2009 New Revision: 55477 URL: http://svn.opensuse.org/viewcvs/yast?rev=55477&view=rev Log: Created tag branch-Code-11-2_17_10 for gtk Added: tags/branch-Code-11-2_17_10/gtk/ - copied from r55476, branches/SuSE-Code-11-Branch/gtk/ -- 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] r55476 - in /trunk/storage/storage/src/include: lvm_lv_lib.ycp lvm_ui_dialogs.ycp
by aschnell＠svn.opensuse.org 12 Feb '09

12 Feb '09

Author: aschnell Date: Thu Feb 12 18:35:12 2009 New Revision: 55476 URL: http://svn.opensuse.org/viewcvs/yast?rev=55476&view=rev Log: - replaced/removed removeLogicalVolume Modified: trunk/storage/storage/src/include/lvm_lv_lib.ycp trunk/storage/storage/src/include/lvm_ui_dialogs.ycp Modified: trunk/storage/storage/src/include/lvm_lv_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_lv_lib.ycp (original) +++ trunk/storage/storage/src/include/lvm_lv_lib.ycp Thu Feb 12 18:35:12 2009 @@ -88,12 +88,6 @@ */ -define boolean removeLogicalVolume( string disk, string device ) - ``{ - return( Storage::DeleteDevice( disk, device )); - }; - - ////////////////////////////////////////////////////////////////////// // // !!!! input: partition_list: must be aready those lvs that belong to current_vg Modified: trunk/storage/storage/src/include/lvm_ui_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_ui_dialogs.ycp (original) +++ trunk/storage/storage/src/include/lvm_ui_dialogs.ycp Thu Feb 12 18:35:12 2009 @@ -441,7 +441,7 @@ if( Popup::YesNo( message )) { - ret = removeLogicalVolume( disk["device"]:"", id ); + ret = Storage::DeleteDevice(disk["device"]:"", id); } } y2milestone( "HandleRemoveLv ret:%1", ret ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0