February 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55595 - /tags/stable-2_18_3/add-on/
by locilka＠svn.opensuse.org 18 Feb '09

18 Feb '09

Author: locilka Date: Wed Feb 18 16:56:24 2009 New Revision: 55595 URL: http://svn.opensuse.org/viewcvs/yast?rev=55595&view=rev Log: Created tag stable-2_18_3 for add-on Added: tags/stable-2_18_3/add-on/ - copied from r55594, trunk/add-on/ -- 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] r55594 - in /trunk/users: package/yast2-users.changes src/dialogs.ycp
by jsuchome＠svn.opensuse.org 18 Feb '09

18 Feb '09

Author: jsuchome Date: Wed Feb 18 16:01:32 2009 New Revision: 55594 URL: http://svn.opensuse.org/viewcvs/yast?rev=55594&view=rev Log: - ask for disabling autologin only when adding 2nd user(bnc#332729) Modified: trunk/users/package/yast2-users.changes trunk/users/src/dialogs.ycp Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.change… ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Wed Feb 18 16:01:32 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Feb 18 16:01:03 CET 2009 - jsuchome(a)suse.cz + +- ask for disabling autologin only when adding 2nd user(bnc#332729) + +------------------------------------------------------------------- Mon Feb 9 12:47:40 CET 2009 - jsuchome(a)suse.cz - added new logging functions which should produce human readable Modified: trunk/users/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/dialogs.ycp?rev=55594&… ============================================================================== --- trunk/users/src/dialogs.ycp (original) +++ trunk/users/src/dialogs.ycp Wed Feb 18 16:01:32 2009 @@ -1762,7 +1762,9 @@ continue; } // check if autologin is not set for some user - if (what == "add_user" && !complex_layout) + if (what == "add_user" && !complex_layout && + // ask only when there is still one user (bnc#332729) + size (UsersCache::GetUsernames ("local")) == 1) { Autologin::AskForDisabling ( // popup text -- 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] r55593 - /tags/branch-Code-11-2_17_20/add-on/
by locilka＠svn.opensuse.org 18 Feb '09

18 Feb '09

Author: locilka Date: Wed Feb 18 15:53:08 2009 New Revision: 55593 URL: http://svn.opensuse.org/viewcvs/yast?rev=55593&view=rev Log: Created tag branch-Code-11-2_17_20 for add-on Added: tags/branch-Code-11-2_17_20/add-on/ - copied from r55592, branches/SuSE-Code-11-Branch/add-on/ -- 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] r55592 - in /trunk/yast2: library/system/src/Kernel.ycp package/yast2.changes
by jsrain＠svn.opensuse.org 18 Feb '09

18 Feb '09

Author: jsrain Date: Wed Feb 18 15:39:30 2009 New Revision: 55592 URL: http://svn.opensuse.org/viewcvs/yast?rev=55592&view=rev Log: use PAE kernel only if there is >3GB of RAM or NX flag is present (bnc#467328) Modified: trunk/yast2/library/system/src/Kernel.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/system/src/Kernel.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/system/src/Kernel.… ============================================================================== --- trunk/yast2/library/system/src/Kernel.ycp (original) +++ trunk/yast2/library/system/src/Kernel.ycp Wed Feb 18 15:39:30 2009 @@ -379,16 +379,16 @@ y2error ("Cannot read cpuflags"); y2milestone ("Mounted: %1", SCR::Execute (.target.bash_output, "mount -l")); } -/* + // check for "roughly" >= 4GB memory (see bug #40729) list memories = (list) SCR::Read(.probe.memory); integer memsize = memories[0,"resource","phys_mem",0,"range"]:0; integer fourGB = 0x0C0000000; y2milestone ("Physical memory %1", memsize); -*/ + // for memory > 4GB and PAE support we install kernel-pae, - // only check PAE CPU - if (/*memsize >= fourGB &&*/ contains (cpuflags, "pae")) + // PAE kernel is needed if NX flag exists as well (bnc#467328) + if ((memsize >= fourGB || contains (cpuflags, "nx")) && contains (cpuflags, "pae")) { y2milestone ("Kernel switch: PAE detected"); kernel_packages = ["kernel-pae"]; Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Wed Feb 18 15:39:30 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 18 15:37:29 CET 2009 - jsrain(a)suse.cz + +- use PAE kernel only if there is >3GB of RAM or NX flag is present + (bnc#467328) + +------------------------------------------------------------------- Mon Feb 16 10:45:05 CET 2009 - mzugec(a)suse.cz - assign to GetInstArgs.args first map, not first argument (bnc#475169) -- 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] r55591 - /trunk/storage/yast2-storage.spec.in
by aschnell＠svn.opensuse.org 18 Feb '09

18 Feb '09

Author: aschnell Date: Wed Feb 18 15:36:21 2009 New Revision: 55591 URL: http://svn.opensuse.org/viewcvs/yast?rev=55591&view=rev Log: - updated filelist Modified: trunk/storage/yast2-storage.spec.in 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 Wed Feb 18 15:36:21 2009 @@ -52,6 +52,7 @@ @yncludedir@/partitioning/*.ycp @clientdir@/inst_custom_part.ycp @clientdir@/inst_resize_ui.ycp +@clientdir@/inst_resize_dialog.ycp @clientdir@/inst_disk.ycp @clientdir@/inst_target_part.ycp @clientdir@/inst_disk_proposal.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] r55590 - /trunk/storage/package/yast2-storage.changes
by aschnell＠svn.opensuse.org 18 Feb '09

18 Feb '09

Author: aschnell Date: Wed Feb 18 15:21:32 2009 New Revision: 55590 URL: http://svn.opensuse.org/viewcvs/yast?rev=55590&view=rev Log: - added version 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 Wed Feb 18 15:21:32 2009 @@ -2,6 +2,7 @@ Wed Feb 18 14:44:45 CET 2009 - aschnell(a)suse.de - converted proposal code to a module +- 2.18.7 ------------------------------------------------------------------- Fri Feb 13 12:42:07 CET 2009 - aschnell(a)suse.de -- 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] r55589 - in /branches/SuSE-Code-11-Branch/add-on: VERSION package/yast2-add-on.changes src/add-on-workflow.ycp
by locilka＠svn.opensuse.org 18 Feb '09

18 Feb '09

Author: locilka Date: Wed Feb 18 15:19:26 2009 New Revision: 55589 URL: http://svn.opensuse.org/viewcvs/yast?rev=55589&view=rev Log: - Reloading libzypp state if user declines the Add-On deinstallation proposal or some add-on finished libzypp in its workflow (bnc #476417). - 2.17.20 Modified: branches/SuSE-Code-11-Branch/add-on/VERSION branches/SuSE-Code-11-Branch/add-on/package/yast2-add-on.changes branches/SuSE-Code-11-Branch/add-on/src/add-on-workflow.ycp Modified: branches/SuSE-Code-11-Branch/add-on/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/add-on/VE… ============================================================================== --- branches/SuSE-Code-11-Branch/add-on/VERSION (original) +++ branches/SuSE-Code-11-Branch/add-on/VERSION Wed Feb 18 15:19:26 2009 @@ -1 +1 @@ -2.17.19 +2.17.20 Modified: branches/SuSE-Code-11-Branch/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/add-on/pa… ============================================================================== --- branches/SuSE-Code-11-Branch/add-on/package/yast2-add-on.changes (original) +++ branches/SuSE-Code-11-Branch/add-on/package/yast2-add-on.changes Wed Feb 18 15:19:26 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Feb 18 13:26:03 CET 2009 - locilka(a)suse.cz + +- Reloading libzypp state if user declines the Add-On + deinstallation proposal or some add-on finished libzypp in its + workflow (bnc #476417). +- 2.17.20 + +------------------------------------------------------------------- Tue Feb 17 13:26:27 CET 2009 - locilka(a)suse.cz - Installed products are not directly connected with their add-on Modified: branches/SuSE-Code-11-Branch/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/add-on/sr… ============================================================================== --- branches/SuSE-Code-11-Branch/add-on/src/add-on-workflow.ycp (original) +++ branches/SuSE-Code-11-Branch/add-on/src/add-on-workflow.ycp Wed Feb 18 15:19:26 2009 @@ -1362,6 +1362,9 @@ counter = counter + 1; y2milestone ("Product: %1, Info: %2", one_product, repository_info); + if (repository_info == nil) { + y2warning ("No matching repository found for product listed above"); + } repository_info = GetRepoInfo (one_product, all_products); @@ -1558,6 +1561,40 @@ Pkg::SourceReleaseAll(); } +// Cleanup UI - Prepare it for progress callbacks +void SetWizardWindowInProgress () { + Wizard::SetContents ( + _("Add-On Products"), + `Label (_("Initializing...")), + _("<p>Initializing add-on products...</p>"), + false, + false + ); + + Wizard::SetTitleIcon ("yast-addon"); +} + +// BNC #476417: When user cancels removing an add-on, we have to neutralize all +// libzypp resolvables to their inital states +void NeutralizeAllResolvables () { + foreach (symbol one_type, [`product, `patch, `package, `srcpackage, `pattern], { + y2milestone ("Neutralizing all: %1", one_type); + Pkg::ResolvableNeutral ("", one_type, true); + }); +} + +// Either there are no repositories now or they +// were changed, neutralized, etc. +void LoadLibzyppNow () { + y2milestone ("Reloading libzypp"); + SetWizardWindowInProgress(); + + // Reinitialize + Pkg::TargetInitialize (Installation::destdir); + Pkg::TargetLoad(); + Pkg::SourceStartManager (true); +} + symbol RunAddOnsOverviewDialog () { y2milestone ("Overview Dialog"); symbol ret = `next; @@ -1593,6 +1630,13 @@ RunAddProductWorkflow(); } + // Something has disabled all the repositories or finished + // libzypp, reload it + list <integer> current_repos = Pkg::SourceGetCurrent(true); + if (current_repos == nil || size (current_repos) == 0) { + LoadLibzyppNow(); + } + CreateAddOnsOverviewDialog(); RedrawAddOnsOverviewTable(); @@ -1600,11 +1644,37 @@ } else if (userret == `delete) { y2milestone ("Removing selected product..."); - if (RemoveProductWithDependencies() == true) { - CreateAddOnsOverviewDialog(); - RedrawAddOnsOverviewTable(); + boolean rpwd = RemoveProductWithDependencies(); + y2milestone ("RPWD result was: %1", rpwd); + + // nil == user decided not to remove the product + if (rpwd == nil) { + y2milestone ("User decided not to remove the selected product"); + continue; + + // false == user decided not confirm the add-on removal + // libzypp has been already changed + // BNC #476417: Getting libzypp to the previous state + } else if (rpwd == false) { + y2milestone ("User aborted the package manager"); + + SetWizardWindowInProgress(); + + // Neutralizing all resolvables (some are usually marked for removal) + NeutralizeAllResolvables(); + Pkg::SourceFinishAll(); + + LoadLibzyppNow(); + + // true == packages and sources have been removed + } else { + // Store sources state + Pkg::SourceSaveAll(); } + CreateAddOnsOverviewDialog(); + RedrawAddOnsOverviewTable(); + // Redrawing info widget } else if (userret == "list_of_addons") { AdjustInfoWidget(); -- 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] r55588 - in /trunk/add-on: VERSION package/yast2-add-on.changes src/add-on-workflow.ycp
by locilka＠svn.opensuse.org 18 Feb '09

18 Feb '09

Author: locilka Date: Wed Feb 18 15:19:00 2009 New Revision: 55588 URL: http://svn.opensuse.org/viewcvs/yast?rev=55588&view=rev Log: - Reloading libzypp state if user declines the Add-On deinstallation proposal or some add-on finished libzypp in its workflow (bnc #476417). - 2.18.3 Modified: trunk/add-on/VERSION trunk/add-on/package/yast2-add-on.changes trunk/add-on/src/add-on-workflow.ycp Modified: trunk/add-on/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/VERSION?rev=55588&r1=5558… ============================================================================== --- trunk/add-on/VERSION (original) +++ trunk/add-on/VERSION Wed Feb 18 15:19:00 2009 @@ -1 +1 @@ -2.18.2 +2.18.3 Modified: trunk/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/package/yast2-add-on.chan… ============================================================================== --- trunk/add-on/package/yast2-add-on.changes (original) +++ trunk/add-on/package/yast2-add-on.changes Wed Feb 18 15:19:00 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Feb 18 13:26:03 CET 2009 - locilka(a)suse.cz + +- Reloading libzypp state if user declines the Add-On + deinstallation proposal or some add-on finished libzypp in its + workflow (bnc #476417). +- 2.18.3 + +------------------------------------------------------------------- Tue Feb 17 13:30:31 CET 2009 - locilka(a)suse.cz - Installed products are not directly connected with their add-on Modified: trunk/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on-workflow.ycp?r… ============================================================================== --- trunk/add-on/src/add-on-workflow.ycp (original) +++ trunk/add-on/src/add-on-workflow.ycp Wed Feb 18 15:19:00 2009 @@ -1362,6 +1362,9 @@ counter = counter + 1; y2milestone ("Product: %1, Info: %2", one_product, repository_info); + if (repository_info == nil) { + y2warning ("No matching repository found for product listed above"); + } repository_info = GetRepoInfo (one_product, all_products); @@ -1558,6 +1561,40 @@ Pkg::SourceReleaseAll(); } +// Cleanup UI - Prepare it for progress callbacks +void SetWizardWindowInProgress () { + Wizard::SetContents ( + _("Add-On Products"), + `Label (_("Initializing...")), + _("<p>Initializing add-on products...</p>"), + false, + false + ); + + Wizard::SetTitleIcon ("yast-addon"); +} + +// BNC #476417: When user cancels removing an add-on, we have to neutralize all +// libzypp resolvables to their inital states +void NeutralizeAllResolvables () { + foreach (symbol one_type, [`product, `patch, `package, `srcpackage, `pattern], { + y2milestone ("Neutralizing all: %1", one_type); + Pkg::ResolvableNeutral ("", one_type, true); + }); +} + +// Either there are no repositories now or they +// were changed, neutralized, etc. +void LoadLibzyppNow () { + y2milestone ("Reloading libzypp"); + SetWizardWindowInProgress(); + + // Reinitialize + Pkg::TargetInitialize (Installation::destdir); + Pkg::TargetLoad(); + Pkg::SourceStartManager (true); +} + symbol RunAddOnsOverviewDialog () { y2milestone ("Overview Dialog"); symbol ret = `next; @@ -1593,6 +1630,13 @@ RunAddProductWorkflow(); } + // Something has disabled all the repositories or finished + // libzypp, reload it + list <integer> current_repos = Pkg::SourceGetCurrent(true); + if (current_repos == nil || size (current_repos) == 0) { + LoadLibzyppNow(); + } + CreateAddOnsOverviewDialog(); RedrawAddOnsOverviewTable(); @@ -1600,11 +1644,37 @@ } else if (userret == `delete) { y2milestone ("Removing selected product..."); - if (RemoveProductWithDependencies() == true) { - CreateAddOnsOverviewDialog(); - RedrawAddOnsOverviewTable(); + boolean rpwd = RemoveProductWithDependencies(); + y2milestone ("RPWD result was: %1", rpwd); + + // nil == user decided not to remove the product + if (rpwd == nil) { + y2milestone ("User decided not to remove the selected product"); + continue; + + // false == user decided not confirm the add-on removal + // libzypp has been already changed + // BNC #476417: Getting libzypp to the previous state + } else if (rpwd == false) { + y2milestone ("User aborted the package manager"); + + SetWizardWindowInProgress(); + + // Neutralizing all resolvables (some are usually marked for removal) + NeutralizeAllResolvables(); + Pkg::SourceFinishAll(); + + LoadLibzyppNow(); + + // true == packages and sources have been removed + } else { + // Store sources state + Pkg::SourceSaveAll(); } + CreateAddOnsOverviewDialog(); + RedrawAddOnsOverviewTable(); + // Redrawing info widget } else if (userret == "list_of_addons") { AdjustInfoWidget(); -- 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] r55587 - in /trunk/storage: ./ package/ storage/src/ storage/src/include/ storage/src/modules/ storage/src/proposal/
by aschnell＠svn.opensuse.org 18 Feb '09

18 Feb '09

Author: aschnell Date: Wed Feb 18 15:15:43 2009 New Revision: 55587 URL: http://svn.opensuse.org/viewcvs/yast?rev=55587&view=rev Log: - converted proposal code to a module Added: trunk/storage/storage/src/modules/StorageProposal.ycp (contents, props changed) - copied, changed from r55577, trunk/storage/storage/src/include/do_proposal_flexible.ycp Removed: trunk/storage/storage/src/include/do_proposal_flexible.ycp Modified: trunk/storage/VERSION trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/auto_part_create.ycp trunk/storage/storage/src/inst_disk_proposal.ycp trunk/storage/storage/src/inst_resize_dialog.ycp trunk/storage/storage/src/inst_resize_ui.ycp trunk/storage/storage/src/inst_target_part.ycp trunk/storage/storage/src/modules/Makefile.am trunk/storage/storage/src/proposal/partitions_proposal.ycp Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=55587&r1=555… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Wed Feb 18 15:15:43 2009 @@ -1 +1 @@ -2.18.6 +2.18.7 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 Wed Feb 18 15:15:43 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Feb 18 14:44:45 CET 2009 - aschnell(a)suse.de + +- converted proposal code to a module + +------------------------------------------------------------------- Fri Feb 13 12:42:07 CET 2009 - aschnell(a)suse.de - use Sequencer.ycp instead of deprecated sequencer.ycp Modified: trunk/storage/storage/src/include/auto_part_create.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/auto… ============================================================================== --- trunk/storage/storage/src/include/auto_part_create.ycp (original) +++ trunk/storage/storage/src/include/auto_part_create.ycp Wed Feb 18 15:15:43 2009 @@ -19,17 +19,16 @@ import "Storage"; import "Partitions"; import "ProductFeatures"; - -include "partitioning/do_proposal_flexible.ycp"; + import "StorageProposal"; boolean create_partitions( map<string,map> tgmap, map disk, list<map> partitions ) { y2milestone( "create_partitions disk:%1", haskey(disk,"partitions")?remove(disk,"partitions"):disk ); y2milestone( "create_partitions partitions %1", partitions ); - flex_init_swapable( tgmap ); + StorageProposal::flex_init_swapable( tgmap ); boolean ret = false; - boolean has_flex = has_flex_proposal(); + boolean has_flex = StorageProposal::has_flex_proposal(); string vm = Storage::ProposalVM(); y2milestone( "create_partitions flex %1 vm %2", has_flex, vm ); disk["partitions"] = partitions; @@ -39,7 +38,7 @@ { if( has_flex ) { - map flex = do_flexible_disk( disk ); + map flex = StorageProposal::do_flexible_disk( disk ); if( flex["ok"]:false ) partitions = flex["disk","partitions"]:[]; } @@ -51,7 +50,7 @@ integer num_del_free = size(filter(map p, partitions, ``(p["type"]:`unknown==`free&& p["delete"]:false))); - map r = can_swap_reuse( disk["device"]:"", partitions, tgmap ); + map r = StorageProposal::can_swap_reuse( disk["device"]:"", partitions, tgmap ); if( haskey( r, "partitions" )) partitions = r["partitions"]:[]; else if( haskey( r, "targets" )) @@ -80,7 +79,7 @@ } else { - partitions = get_proposal( size(r)>0, disk ); + partitions = StorageProposal::get_proposal( size(r)>0, disk ); } } y2milestone( "create_partitions %1", partitions ); @@ -100,7 +99,7 @@ }); y2milestone( "create_partitions id_save %1", id_save ); y2milestone( "create_partitions ps %1", disk["partitions"]:[] ); - map r = get_proposal_vm( tgmap, vm, disk ); + map r = StorageProposal::get_proposal_vm( tgmap, vm, disk ); ret = r["ok"]:false; if( ret ) { Modified: trunk/storage/storage/src/inst_disk_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_disk_pr… ============================================================================== --- trunk/storage/storage/src/inst_disk_proposal.ycp (original) +++ trunk/storage/storage/src/inst_disk_proposal.ycp Wed Feb 18 15:15:43 2009 @@ -29,9 +29,10 @@ import "Popup"; import "Storage"; import "Sequencer"; + import "StorageProposal"; include "partitioning/custom_part_check_generated.ycp"; - include "partitioning/do_proposal_flexible.ycp"; + define boolean AskOverwriteChanges() ``{ @@ -137,7 +138,7 @@ string changes = ""; if( Storage::GetPartProposalFirst() ) { - map prop = get_inst_prop( Storage::GetTargetMap() ); + map prop = StorageProposal::get_inst_prop(Storage::GetTargetMap()); y2milestone( "prop ok:%1", prop["ok"]:false ); if( prop["ok"]:false ) { @@ -282,7 +283,7 @@ Storage::SetProposalLvm(false); Storage::ResetOndiskTarget(); Storage::AddMountPointsForWin(Storage::GetTargetMap()); - map prop = get_inst_prop( Storage::GetTargetMap()); + map prop = StorageProposal::get_inst_prop(Storage::GetTargetMap()); if( !prop["ok"]:false ) { Popup::Error( _("Impossible to create the requested proposal.") ); Modified: trunk/storage/storage/src/inst_resize_dialog.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_resize_… ============================================================================== --- trunk/storage/storage/src/inst_resize_dialog.ycp (original) +++ trunk/storage/storage/src/inst_resize_dialog.ycp Wed Feb 18 15:15:43 2009 @@ -25,9 +25,10 @@ import "Wizard"; import "Product"; import "Installation"; +import "StorageProposal"; include "partitioning/partition_defines.ycp"; -include "partitioning/do_proposal_flexible.ycp"; + list<integer> DiskUsage (string win_device) { integer win_used = -1; @@ -414,7 +415,7 @@ if (Storage::resize_partition == nil) { Storage::ResetOndiskTarget(); Storage::AddMountPointsForWin(Storage::GetTargetMap()); - get_inst_prop (Storage::GetTargetMap ()); + StorageProposal::get_inst_prop(Storage::GetTargetMap()); if (Storage::resize_partition == nil) // no resize { Storage::ResetOndiskTarget(); @@ -434,7 +435,7 @@ Storage::ResetOndiskTarget(); Storage::AddMountPointsForWin(Storage::GetTargetMap()); map prop = $[]; - prop = get_inst_prop( Storage::GetTargetMap()); + prop = StorageProposal::get_inst_prop(Storage::GetTargetMap()); y2milestone( "prop ok:%1", prop["ok"]:false ); if( prop["ok"]:false ) { Storage::SetTargetMap( prop["target"]:$[] ); 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 Wed Feb 18 15:15:43 2009 @@ -23,7 +23,6 @@ import "Installation"; include "partitioning/partition_defines.ycp"; - include "partitioning/do_proposal_flexible.ycp"; // Automatically return if resizing is not requested // Modified: trunk/storage/storage/src/inst_target_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_target_… ============================================================================== --- trunk/storage/storage/src/inst_target_part.ycp (original) +++ trunk/storage/storage/src/inst_target_part.ycp Wed Feb 18 15:15:43 2009 @@ -389,7 +389,7 @@ } return( p ); }); - partitions = try_remove_sole_extended( partitions ); + partitions = StorageProposal::try_remove_sole_extended( partitions ); y2milestone ("partitions '%1'", partitions); Modified: trunk/storage/storage/src/modules/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Make… ============================================================================== --- trunk/storage/storage/src/modules/Makefile.am (original) +++ trunk/storage/storage/src/modules/Makefile.am Wed Feb 18 15:15:43 2009 @@ -15,6 +15,7 @@ StorageControllers.ycp \ StorageDevices.ycp \ StorageFields.ycp \ + StorageProposal.ycp \ StorageSettings.ycp \ StorageIcons.ycp \ TreePanel.ycp \ Copied: trunk/storage/storage/src/modules/StorageProposal.ycp (from r55577, trunk/storage/storage/src/include/do_proposal_flexible.ycp) URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/include/do_proposal_flexible.ycp (original) +++ trunk/storage/storage/src/modules/StorageProposal.ycp Wed Feb 18 15:15:43 2009 @@ -11,19 +11,17 @@ * * Description: Make a proposal for partitioning * - * - ************************************************************* - - $Id$ -*/ + *************************************************************/ { + module "StorageProposal"; -textdomain "storage"; + textdomain "storage"; -import "FileSystems"; -import "Partitions"; -import "Storage"; -import "ProductFeatures"; + import "FileSystems"; + import "Partitions"; + import "Storage"; + import "ProductFeatures"; + import "Arch"; map read_partition_config( string fpath ); map read_partition_xml_config(); @@ -78,7 +76,7 @@ map swapable = $[]; -void flex_init_swapable( map<string,map> tg ) +global void flex_init_swapable( map<string,map> tg ) { swapable = $[]; list swaps = Storage::SwappingPartitions(); @@ -110,7 +108,7 @@ return( "/part.info" ); } -define boolean has_flex_proposal() +global boolean has_flex_proposal() ``{ boolean ret = (integer)SCR::Read( .target.size, pinfo_name() )>0; if( !ret ) @@ -162,7 +160,7 @@ return( tc ); } -define map do_flexible_disk( map disk ) +global map do_flexible_disk( map disk ) ``{ string dev = disk["device"]:""; y2milestone( "do_flexible_disk dev %1", dev ); @@ -1400,6 +1398,7 @@ return( g ); }; + define map distribute_space( integer rest, list weights, list added, list ps ) ``{ integer diff_sum = 0; @@ -1461,6 +1460,7 @@ return( ret ); } + define integer do_weighting( list ps, map g ) ``{ y2milestone( "do_weighting gap %1", g["gap"]:[] ); @@ -1553,7 +1553,7 @@ return( ret ); }; -define list<map> try_remove_sole_extended( list<map> parts ) +global list<map> try_remove_sole_extended( list<map> parts ) { list<map> ret = parts; if( find( map p, ret, @@ -2143,7 +2143,7 @@ return( conf ); } -map can_swap_reuse( string disk, list<map> partitions, map<string,map> tgmap ) +global map can_swap_reuse( string disk, list<map> partitions, map<string,map> tgmap ) { map ret = $[]; y2milestone( "can_swap_reuse disk %1 partitions %2", disk, partitions ); @@ -2309,7 +2309,7 @@ return( l ); } -list<map> get_proposal( boolean have_swap, map disk ) +global list<map> get_proposal( boolean have_swap, map disk ) { list<map> ret = []; y2milestone( "get_proposal have_swap:%1 disk %2", have_swap, disk ); @@ -3140,17 +3140,6 @@ return( ret ); } -integer round_mb_pe( integer mb, integer pebyte ) - { - integer pek = pebyte/1024; - if( pek<1 ) - pek = 1; - integer ret = (mb*1024 + pek-1) / pek * pek; - if( ret==0 ) - ret=1; - y2milestone( "round_mb_pe mb %1 pebyte %2 ret %3", mb, pebyte, ret ); - return( ret ); - } map modify_vm( map vm, map opts, boolean need_swap ) { @@ -3627,7 +3616,7 @@ return( ret ); } -map get_proposal_vm( map<string,map> target, string key, map disk ) +global map get_proposal_vm( map<string,map> target, string key, map disk ) { string ddev = disk["device"]:""; y2milestone("get_proposal_vm ddev:%1 vg:%2 lvm:%3 home:%4", ddev, @@ -3683,7 +3672,7 @@ return( ret ); } -map get_inst_prop( map<string,map> target ) +global map get_inst_prop( map<string,map> target ) { map ret = $[]; string vg = Storage::ProposalVM(); @@ -3705,4 +3694,3 @@ } } - 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 Wed Feb 18 15:15:43 2009 @@ -1,4 +1,4 @@ - /** +/** * Module: proposal_partitions.ycp * * $Id$ @@ -17,8 +17,7 @@ import "Mode"; import "Storage"; import "Sequencer"; - - include "partitioning/do_proposal_flexible.ycp"; + import "StorageProposal"; string func = (string) WFM::Args(0); map param = (map) WFM::Args(1); @@ -45,7 +44,7 @@ Storage::AddMountPointsForWin(Storage::GetTargetMap()); } map prop = $[]; - prop = get_inst_prop( Storage::GetTargetMap()); + prop = StorageProposal::get_inst_prop( Storage::GetTargetMap()); y2milestone( "prop ok:%1", prop["ok"]:false ); if( prop["ok"]: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] r55586 - /trunk/storage/storage/src/Makefile.am
by aschnell＠svn.opensuse.org 18 Feb '09

18 Feb '09

Author: aschnell Date: Wed Feb 18 15:05:04 2009 New Revision: 55586 URL: http://svn.opensuse.org/viewcvs/yast?rev=55586&view=rev Log: - I suppose inst_resize_dialog.ycp should be included Modified: trunk/storage/storage/src/Makefile.am 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 Wed Feb 18 15:05:04 2009 @@ -10,6 +10,7 @@ inst_disk_proposal.ycp \ inst_prepdisk.ycp \ inst_resize_ui.ycp \ + inst_resize_dialog.ycp \ inst_target_part.ycp \ inst_target_selection.ycp \ storage_finish.ycp -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0