December 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60184 - /trunk/storage/storage/src/include/ep-hd-lib.ycp
by aschnell＠svn.opensuse.org 22 Dec '09

22 Dec '09

Author: aschnell Date: Tue Dec 22 16:17:46 2009 New Revision: 60184 URL: http://svn.opensuse.org/viewcvs/yast?rev=60184&view=rev Log: - use helpButton feature Modified: trunk/storage/storage/src/include/ep-hd-lib.ycp Modified: trunk/storage/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-lib.ycp Tue Dec 22 16:17:46 2009 @@ -366,6 +366,7 @@ list <map> myparts = target_map[ device, "partitions"]:[]; string mypart_table_type = target_map[ device, "label" ]:Storage::DefaultDiskLabel( mysize ); + // helptext string helptext = _("Select one or more (if available) hard disks that will have the same partition layout as this disk. @@ -373,18 +374,6 @@ more partitions. After cloning, these partitions will be deleted."); - void HelpDialog() { - UI::OpenDialog( `MinSize( 40,10,`VBox( - `RichText(helptext), - `VSpacing(1), - `PushButton(`id(`ok), Label::CloseButton()) - ) - )); - - UI::UserInput(); - UI::CloseDialog(); - } - list <string> AvailableTargetDisks() { list <string> items = []; @@ -457,15 +446,16 @@ `MultiSelectionBox(`id(`tdisk), _("Available target disks:"), ui_items ), `VSpacing(1), `ButtonBox( - `PushButton(`id(`help), Label::HelpButton()), + `PushButton(`id(`help), `opt(`helpButton), Label::HelpButton()), `PushButton(`id(`ok), `opt(`default), Label::OKButton()), `PushButton(`id(`cancel), Label::CancelButton()) ) ) )); + UI::ChangeWidget(`help, `HelpText, helptext); + any ret = nil; - boolean run_raid_setup = false; while(ret != `ok && ret != `cancel) { @@ -473,9 +463,8 @@ if( ret == `ok) { list <string> selected_disks = (list <string>) UI::QueryWidget(`id(`tdisk), `SelectedItems); - boolean any_disk_selected = !isempty(selected_disks); - if (!any_disk_selected) { + if (isempty(selected_disks)) { Popup::Error(_("Select some target disk for creating a clone")); UI::SetFocus(`id(`tdisk)); ret = nil; @@ -541,10 +530,6 @@ Storage::SetRecursiveRemoval( recursive ); } - else if (ret == `help) { - HelpDialog(); - continue; - } } UI::CloseDialog(); -- 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] <rest-service> master : added graph configuration file; some changes due Josefs comments, thanks :-)
by Stefan Schubert 22 Dec '09

22 Dec '09

ref: refs/heads/master commit 3d50d859e09ef7bd8c631218b7d7ed17a1ee84fe Author: Stefan Schubert <schubi(a)suse.de> Date: Tue Dec 22 16:01:33 2009 +0100 added graph configuration file; some changes due Josefs comments, thanks :-) --- plugins/status/app/models/metric.rb | 25 ++++-- plugins/status/app/views/metrics/show.html.erb | 2 + plugins/status/app/views/metrics/show.xml.erb | 2 + plugins/status/config/status_configuration.yaml | 87 ++++++++++++++++++++ .../status/package/yast2-webservice-status.spec | 5 +- 5 files changed, 113 insertions(+), 8 deletions(-) diff --git a/plugins/status/app/models/metric.rb b/plugins/status/app/models/metric.rb index ef8ec02..91d209d 100644 --- a/plugins/status/app/models/metric.rb +++ b/plugins/status/app/models/metric.rb @@ -258,12 +258,25 @@ class Metric xml.plugin_instance plugin_instance xml.type type xml.type_instance type_instance - - if @conf and @conf.has_key?(id) + if @conf + line_id = id[host.length+1..id.length-1] #remove hostname from id + limits = nil + @conf.each_value{|group| + group["graphs"].each{|graph| + graph["lines"].each{|line| + if line["id"] == line_id + limits = line["limits"] + break + end + } + break unless limits == nil + } + break unless limits == nil + } xml.limits() do - xml.max(@conf["#{id}"]["max"]) - xml.min(@conf["#{id}"]["min"]) - end + xml.max(limits["max"]) + xml.min(limits["min"]) + end if limits end # serialize data unless it is disabled @@ -298,7 +311,7 @@ class Metric def self.run_rrdtool(file, opts={}) #checking if collectd is running - ServiceNotRunning.new('collectd') unless collectd_running? + raise ServiceNotRunning.new('collectd') unless collectd_running? #checking if systemtime is BEHIND the last entry of collectd. #If yes, no data will be available. diff --git a/plugins/status/app/views/metrics/show.html.erb b/plugins/status/app/views/metrics/show.html.erb new file mode 100644 index 0000000..ab88948 --- /dev/null +++ b/plugins/status/app/views/metrics/show.html.erb @@ -0,0 +1,2 @@ +<%= @metric.to_xml( :root => "metric", :start => @start, :stop => @stop, :data => @data, :dasherize => false ) -%> + diff --git a/plugins/status/app/views/metrics/show.xml.erb b/plugins/status/app/views/metrics/show.xml.erb new file mode 100644 index 0000000..ab88948 --- /dev/null +++ b/plugins/status/app/views/metrics/show.xml.erb @@ -0,0 +1,2 @@ +<%= @metric.to_xml( :root => "metric", :start => @start, :stop => @stop, :data => @data, :dasherize => false ) -%> + diff --git a/plugins/status/config/status_configuration.yaml b/plugins/status/config/status_configuration.yaml new file mode 100644 index 0000000..a4b3713 --- /dev/null +++ b/plugins/status/config/status_configuration.yaml @@ -0,0 +1,87 @@ +--- +CPU: + y_label: Percent + y_scale: 1 + graphs: + - cummulated: false + headline: CPU + lines: + - id: cpu-0+cpu-idle + limits: + min: 0 + max: 0 + label: Used + - id: cpu-0+cpu-user + limits: + min: 0 + max: 0 + label: Free +Memory: + y_label: MByte + y_scale: 1024 + graphs: + - cummulated: true + headline: Memory + lines: + - id: memory+memory-used + limits: + min: 0 + max: 0 + label: Used + - id: memory+memory-free + limits: + min: 0 + max: 0 + label: Free + - id: memory+memory-cached + limits: + min: 0 + max: 0 + label: Cached +Network: + y_label: + y_scale: 1 + graphs: + - cummulated: false + headline: Network + lines: + - id: interface+if_errors-eth0 + limits: + min: 0 + max: 0 + label: Errors eth0 + - id: if_packets-eth0 + limits: + min: 0 + max: 0 + label: Packages eth0 +Disk: + y_label: MByte + y_scale: 1024 + graphs: + - cummulated: true + headline: root + lines: + - id: df+df-root+free + limits: + min: 0 + max: 0 + label: Errors eth0 + - id: df+df-root+used + limits: + min: 0 + max: 0 + label: Packages eth0 + - cummulated: true + headline: dev + lines: + - id: df+df-dev+free + limits: + min: 0 + max: 0 + label: Errors eth0 + - id: df+df-dev+used + limits: + min: 0 + max: 0 + label: Packages eth0 diff --git a/plugins/status/package/yast2-webservice-status.spec b/plugins/status/package/yast2-webservice-status.spec index fb1e1dc..81e8ee6 100644 --- a/plugins/status/package/yast2-webservice-status.spec +++ b/plugins/status/package/yast2-webservice-status.spec @@ -58,7 +58,6 @@ Authors: mkdir -p $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name} cp -a * $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name} rm -f $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/COPYING -#rm $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/config/status_limits.yaml # Policies mkdir -p $RPM_BUILD_ROOT/usr/share/PolicyKit/policy @@ -109,7 +108,7 @@ rccollectd restart %dir /srv/www/%{pkg_user}/vendor/plugins %dir /srv/www/%{pkg_user}/vendor/plugins/%{plugin_name} %dir /srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/doc -%attr(-,%{pkg_user},%{pkg_user}) %dir /srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/config +%dir /srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/config %dir /usr/share/PolicyKit %dir /usr/share/PolicyKit/policy /srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/* @@ -117,6 +116,8 @@ rccollectd restart %attr(644,root,root) %config /usr/share/PolicyKit/policy/org.opensuse.yast.modules.logfile.policy /srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/doc/README_FOR_APP /srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/doc/logs.yml +%attr(-,%{pkg_user},%{pkg_user}) /srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/config/status_configuration.yaml + %doc COPYING %changelog -- 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] r60183 - /tags/stable-2_19_0/product-creator/
by jsuchome＠svn.opensuse.org 22 Dec '09

22 Dec '09

Author: jsuchome Date: Tue Dec 22 15:49:35 2009 New Revision: 60183 URL: http://svn.opensuse.org/viewcvs/yast?rev=60183&view=rev Log: Created tag stable-2_19_0 for product-creator Added: tags/stable-2_19_0/product-creator/ - copied from r60182, trunk/product-creator/ -- 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] r60182 - /tags/branch-Code-11-SP1-2_17_27/product-creator/
by jsuchome＠svn.opensuse.org 22 Dec '09

22 Dec '09

Author: jsuchome Date: Tue Dec 22 15:49:33 2009 New Revision: 60182 URL: http://svn.opensuse.org/viewcvs/yast?rev=60182&view=rev Log: Created tag branch-Code-11-SP1-2_17_27 for product-creator Added: tags/branch-Code-11-SP1-2_17_27/product-creator/ (props changed) - copied from r60181, branches/SuSE-Code-11-SP1-Branch/product-creator/ -- 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] r60181 - in /trunk/product-creator: VERSION package/yast2-product-creator.changes src/complex.ycp src/dialogs.ycp
by jsuchome＠svn.opensuse.org 22 Dec '09

22 Dec '09

Author: jsuchome Date: Tue Dec 22 15:49:28 2009 New Revision: 60181 URL: http://svn.opensuse.org/viewcvs/yast?rev=60181&view=rev Log: - use menubutton for both iso image and directory tree (bnc#438223) - check for presence of autoyast profile (bnc#503047) - 2.19.0 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/complex.ycp trunk/product-creator/src/dialogs.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=6018… ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Tue Dec 22 15:49:28 2009 @@ -1 +1 @@ -2.18.11 +2.19.0 Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Tue Dec 22 15:49:28 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Dec 22 15:31:27 CET 2009 - jsuchome(a)suse.cz + +- use menubutton for both iso image and directory tree (bnc#438223) +- check for presence of autoyast profile (bnc#503047) +- 2.19.0 + +------------------------------------------------------------------- Fri Sep 4 15:17:06 CEST 2009 - jsuchome(a)suse.cz - merge changes from SLE11: Modified: trunk/product-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/complex.ycp?… ============================================================================== --- trunk/product-creator/src/complex.ycp (original) +++ trunk/product-creator/src/complex.ycp Tue Dec 22 15:49:28 2009 @@ -137,8 +137,13 @@ term contents2 = `VBox( contents, `HBox ( - // push button label - `PushButton(`id(`create_button), _("&Create Product")), + // menu button label + `MenuButton (`id (`create_button), _("&Create Product..."), [ + // button label + `item(`id(`create_iso_button), _("ISO Image")), + // button label + `item(`id(`create_tree_button), _("Directory Tree")) + ]), // menu button label `MenuButton (`id (`kiwi), _("Cre&ate Image with KIWI..."), [ // push button label @@ -213,11 +218,25 @@ continue; } /* create */ - else if(ret == `create_button) { + else if(ret == `create_iso_button || ret == `create_tree_button) { string current = (string) UI::QueryWidget(`id(`table), `CurrentItem ); ProductCreator::Config = ProductCreator::Configs[current]:$[]; // check the needed packages if (!checkNeededPackages()) continue; + + if (ret == `create_iso_button) + { + ProductCreator::Config["result"] = "iso"; + string isofile_path = ProductCreator::Config["isofile"]:""; + if (isofile_path == "") + { + ProductCreator::Config["isofile"] = ProductCreator::Config["name"]:"" + ".iso"; + } + } + else + { + ProductCreator::Config["result"] = "tree"; + } ret = `create; break; } Modified: trunk/product-creator/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/dialogs.ycp?… ============================================================================== --- trunk/product-creator/src/dialogs.ycp (original) +++ trunk/product-creator/src/dialogs.ycp Tue Dec 22 15:49:28 2009 @@ -11,6 +11,7 @@ textdomain "product-creator"; + import "FileUtils"; import "ProductCreator"; import "Wizard"; import "SourceManager"; @@ -231,8 +232,15 @@ if (rb == `autoyast) { + string profile_loc = (string)UI::QueryWidget(`id(`profile_loc), `Value); + if (!FileUtils::Exists (profile_loc)) + { + // error message + Report::Error (sformat (_("The file '%1' does not exist. Choose a correct one."), profile_loc)); + continue; + } ProductCreator::Config["pkgtype"] = "autoyast"; - ProductCreator::Config["profile"] = (string)UI::QueryWidget(`id(`profile_loc), `Value); + ProductCreator::Config["profile"] = profile_loc; ProductCreator::Config["copy_profile"] = (boolean)UI::QueryWidget(`id(`copyprofile), `Value); } else { @@ -256,7 +264,8 @@ continue; } else { - y2error("unexpected retcode: %1", ret); + if (ret != `autoyast && ret != `pkgmgr) + y2error("unexpected retcode: %1", ret); continue; } } -- 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] r60180 - in /branches/SuSE-Code-11-SP1-Branch/product-creator: VERSION package/yast2-product-creator.changes src/complex.ycp src/dialogs.ycp
by jsuchome＠svn.opensuse.org 22 Dec '09

22 Dec '09

Author: jsuchome Date: Tue Dec 22 15:49:21 2009 New Revision: 60180 URL: http://svn.opensuse.org/viewcvs/yast?rev=60180&view=rev Log: - use menubutton for both iso image and directory tree (bnc#438223) - check for presence of autoyast profile (bnc#503047) - 2.17.27 Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-Code-11-SP1-Branch/product-creator/src/complex.ycp branches/SuSE-Code-11-SP1-Branch/product-creator/src/dialogs.ycp Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION Tue Dec 22 15:49:21 2009 @@ -1 +1 @@ -2.17.26 +2.17.27 Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes Tue Dec 22 15:49:21 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Dec 22 15:43:41 CET 2009 - jsuchome(a)suse.cz + +- use menubutton for both iso image and directory tree (bnc#438223) +- check for presence of autoyast profile (bnc#503047) +- 2.17.27 + +------------------------------------------------------------------- Mon Aug 3 15:32:25 CEST 2009 - jsuchome(a)suse.cz - give kiwi more time to finish (bnc#525986) Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/src/complex.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/src/complex.ycp Tue Dec 22 15:49:21 2009 @@ -137,8 +137,13 @@ term contents2 = `VBox( contents, `HBox ( - // push button label - `PushButton(`id(`create_button), _("&Create Product")), + // menu button label + `MenuButton (`id (`create_button), _("&Create Product..."), [ + // button label + `item(`id(`create_iso_button), _("ISO Image")), + // button label + `item(`id(`create_tree_button), _("Directory Tree")) + ]), // menu button label `MenuButton (`id (`kiwi), _("Cre&ate Image with KIWI..."), [ // push button label @@ -213,11 +218,25 @@ continue; } /* create */ - else if(ret == `create_button) { + else if(ret == `create_iso_button || ret == `create_tree_button) { string current = (string) UI::QueryWidget(`id(`table), `CurrentItem ); ProductCreator::Config = ProductCreator::Configs[current]:$[]; // check the needed packages if (!checkNeededPackages()) continue; + + if (ret == `create_iso_button) + { + ProductCreator::Config["result"] = "iso"; + string isofile_path = ProductCreator::Config["isofile"]:""; + if (isofile_path == "") + { + ProductCreator::Config["isofile"] = ProductCreator::Config["name"]:"" + ".iso"; + } + } + else + { + ProductCreator::Config["result"] = "tree"; + } ret = `create; break; } Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/src/dialogs.ycp Tue Dec 22 15:49:21 2009 @@ -11,6 +11,7 @@ textdomain "product-creator"; + import "FileUtils"; import "ProductCreator"; import "Wizard"; import "SourceManager"; @@ -231,8 +232,15 @@ if (rb == `autoyast) { + string profile_loc = (string)UI::QueryWidget(`id(`profile_loc), `Value); + if (!FileUtils::Exists (profile_loc)) + { + // error message + Report::Error (sformat (_("The file '%1' does not exist. Choose a correct one."), profile_loc)); + continue; + } ProductCreator::Config["pkgtype"] = "autoyast"; - ProductCreator::Config["profile"] = (string)UI::QueryWidget(`id(`profile_loc), `Value); + ProductCreator::Config["profile"] = profile_loc; ProductCreator::Config["copy_profile"] = (boolean)UI::QueryWidget(`id(`copyprofile), `Value); } else { @@ -256,7 +264,8 @@ continue; } else { - y2error("unexpected retcode: %1", ret); + if (ret != `autoyast && ret != `pkgmgr) + y2error("unexpected retcode: %1", ret); continue; } } -- 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] r60179 - in /trunk/storage: package/yast2-storage.changes storage/src/include/ep-hd-lib.ycp storage/src/include/ep-hd.ycp storage/src/include/ep-main.ycp storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 22 Dec '09

22 Dec '09

Author: aschnell Date: Tue Dec 22 15:29:58 2009 New Revision: 60179 URL: http://svn.opensuse.org/viewcvs/yast?rev=60179&view=rev Log: - support for cloning disk partition layout (fate #303809) (port from SLE11 SP1) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-hd-lib.ycp trunk/storage/storage/src/include/ep-hd.ycp trunk/storage/storage/src/include/ep-main.ycp trunk/storage/storage/src/modules/Storage.ycp 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 Tue Dec 22 15:29:58 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Dec 22 14:23:40 CET 2009 - aschnell(a)suse.de + +- support for cloning disk partition layout (fate #303809) + +------------------------------------------------------------------- Mon Dec 21 14:17:30 CET 2009 - aschnell(a)suse.de - added testsuite for partitioning proposal Modified: trunk/storage/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-lib.ycp Tue Dec 22 15:29:58 2009 @@ -357,6 +357,206 @@ } + void EpCloneDisk(string device) + { + map<string, map> target_map = Storage::GetTargetMap(); + + integer mysize = target_map[ device, "size_k"]:0; + integer mycyl_size = target_map[ device, "cyl_size"]:0; + list <map> myparts = target_map[ device, "partitions"]:[]; + string mypart_table_type = target_map[ device, "label" ]:Storage::DefaultDiskLabel( mysize ); + + string helptext = _("Select one or more (if available) hard disks +that will have the same partition layout as +this disk. +Disks marked with '*' sign contain one or +more partitions. After cloning, these +partitions will be deleted."); + + void HelpDialog() { + UI::OpenDialog( `MinSize( 40,10,`VBox( + `RichText(helptext), + `VSpacing(1), + `PushButton(`id(`ok), Label::CloseButton()) + ) + )); + + UI::UserInput(); + UI::CloseDialog(); + } + + list <string> AvailableTargetDisks() { + list <string> items = []; + + map <string, map> filtered_target_map = + filter( string dev, map props, target_map, { + return ( dev != device && + Storage::IsDiskType( props["type"]:`CT_UNKNOWN ) && + props["used_by_device"]:"" == "" && + props["cyl_size"]:0 == mycyl_size ); + }); + + y2milestone("Available, suitable and unused disks (other than %1): %2", device, Map::Keys(filtered_target_map)); + + foreach( string dev, map props, filtered_target_map,{ + if( props["size_k"]:0 >= mysize ) + items = add(items, dev); + else + y2milestone("%1 is smaller than needed, skipping it", device); + }); + + return items; + } + + boolean ConfirmDeletePartitions( list <string> to_delete) { + + UI::OpenDialog( `opt(`warncolor), `VBox( + `Left(`Label(_("The following partitions will be deleted\nand all data on them will be lost:"))), + `VSpacing(1), + `RichText(HTML::List( to_delete)), + `Left(`Label(_("Really delete these partitions?"))), + `VSpacing(1), + `ButtonBox( + `PushButton(`id(`ok), `opt(`default), Label::DeleteButton()), + `PushButton(`id(`cancel), Label::CancelButton()) + ) + ) + ); + symbol ret = (symbol) UI::UserInput(); + UI::CloseDialog(); + + return (ret == `ok); + } + + if (isempty(myparts)) { + Popup::Error(_("There are no partitions on this disk (a clonable +disk must have at least one partition). +Create some partitions before cloning the disk.")); + return; + } + + list <string> mydisks = AvailableTargetDisks(); + + if (isempty(mydisks)) { + Popup::Error("This disk cannot be cloned. There are no suitable +disks that could have the same partitioning layout."); + return; + } + + list<term> ui_items = maplist( string one_disk, mydisks, { + boolean any_partitions = !isempty(target_map[ one_disk, "partitions" ]:[]); + + return `item(`id(one_disk), sformat("%1%2 (%3)",one_disk, + any_partitions ? "*" : "", + Storage::KByteToHumanString( target_map[one_disk, "size_k"]:42))); + }); + + UI::OpenDialog (`MinSize( 60, 20, `VBox( + `Heading(sformat(_("Clone partition layout of %1"), device)), + `VSpacing(1), + `MultiSelectionBox(`id(`tdisk), _("Available target disks:"), ui_items ), + `VSpacing(1), + `ButtonBox( + `PushButton(`id(`help), Label::HelpButton()), + `PushButton(`id(`ok), `opt(`default), Label::OKButton()), + `PushButton(`id(`cancel), Label::CancelButton()) + ) + ) + )); + + any ret = nil; + boolean run_raid_setup = false; + + while(ret != `ok && ret != `cancel) + { + ret = UI::UserInput(); + + if( ret == `ok) { + list <string> selected_disks = (list <string>) UI::QueryWidget(`id(`tdisk), `SelectedItems); + boolean any_disk_selected = !isempty(selected_disks); + + if (!any_disk_selected) { + Popup::Error(_("Select some target disk for creating a clone")); + UI::SetFocus(`id(`tdisk)); + ret = nil; + continue; + } + + list <string> partitions_to_delete = []; + + //collect partitions to delete + foreach (string this_disk, selected_disks, { + list <map> partitions = target_map[ this_disk, "partitions" ]:[]; + + if (!isempty(partitions)) { + list <string> tmp = maplist( map one_part, partitions, { + return one_part["device"]:""; + }); + partitions_to_delete = (list <string>) union( partitions_to_delete, tmp); + } + }); + + //if there is anything to delete, ask user if s/he really wants to delete + if ( !isempty(partitions_to_delete) && + !ConfirmDeletePartitions( partitions_to_delete )) { + ret = nil; + continue; + } + + //We'll be deleting recursively, so that no longer valid + //LVMs and RAIDs are not left behind + boolean recursive = Storage::GetRecursiveRemoval(); + Storage::SetRecursiveRemoval(true); + + foreach (string this_disk, selected_disks, { + map <string,any> disk_info = Storage::GetDisk( target_map, this_disk ); + list <map> partitions = target_map[ this_disk, "partitions" ]:[]; + list<string> pnames = maplist(map part, partitions, { return part["device"]:""; }); + string part_table_type = disk_info["label"]:Storage::DefaultDiskLabel(disk_info["size_k"]:0); + + y2milestone("Deleting these partitions: %1", pnames); + + if (!isempty(partitions)) { + foreach( string one_partition, pnames,{ + Storage::DeleteDevice( disk_info["device"]:"", one_partition ); + }); + } + + if( mypart_table_type != part_table_type ) { + y2milestone("%1 has different type of partition table: %2, will create a new one", + this_disk, part_table_type); + Storage::CreatePartitionTable( disk_info["device"]:"", mypart_table_type ); + } + + foreach( map one_partition, myparts, { + map next = Storage::NextPartition( this_disk, one_partition["type"]:`none); + Storage::CreatePartition( this_disk, next["device"]:"error", + one_partition["type"]:`primary, + one_partition["fsid"]: Partitions::fsid_native, + one_partition["region",0]:0, one_partition["region",1]:0, + one_partition["mountby"]:Storage::GetMountBy(device) ); + //FIXME: ChangeVolumeProperties too? + }); + }); + + Storage::SetRecursiveRemoval( recursive ); + } + else if (ret == `help) { + HelpDialog(); + continue; + } + } + + UI::CloseDialog(); + + if( ret == `ok ) { + UpdateMainStatus(); + UpdateNavigationTree(nil); + TreePanel::Create(); + } + } + + void EpDasdfmtDisk(string device) { map<string, map> target_map = Storage::GetTargetMap(); 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 Tue Dec 22 15:29:58 2009 @@ -259,7 +259,10 @@ list<term> expert_cmds = [ `item(`id(`create_partition_table), // menu entry text - _("Create New Partition Table")) + _("Create New Partition Table")), + `item(`id(`clone_disk), + // menu entry text + _("Clone This Disk")) ]; if (Arch::s390() && search(device, "/dev/dasd") == 0) @@ -308,6 +311,10 @@ EpCreatePartitionTable(disk_device); break; + case `clone_disk: + EpCloneDisk(disk_device); + break; + case `dasdfmt: EpDasdfmtDisk(disk_device); break; Modified: trunk/storage/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-m… ============================================================================== --- trunk/storage/storage/src/include/ep-main.ycp (original) +++ trunk/storage/storage/src/include/ep-main.ycp Tue Dec 22 15:29:58 2009 @@ -33,6 +33,7 @@ import "ProductFeatures"; import "Directory"; import "HTML"; + import "Map"; include "partitioning/lvm_ui_dialogs.ycp"; include "partitioning/raid_lib.ycp"; 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 Tue Dec 22 15:29:58 2009 @@ -1570,7 +1570,7 @@ integer count=0; -boolean IsDiskType(symbol t) +global boolean IsDiskType(symbol t) { return contains([ `CT_DISK, `CT_DMRAID, `CT_DMMULTIPATH ], t); } -- 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] r60178 - /tags/stable-2_19_1/add-on-creator/
by jsuchome＠svn.opensuse.org 22 Dec '09

22 Dec '09

Author: jsuchome Date: Tue Dec 22 14:38:09 2009 New Revision: 60178 URL: http://svn.opensuse.org/viewcvs/yast?rev=60178&view=rev Log: Created tag stable-2_19_1 for add-on-creator Added: tags/stable-2_19_1/add-on-creator/ - copied from r60177, trunk/add-on-creator/ -- 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] r60177 - /tags/branch-Code-11-SP1-2_17_14/add-on-creator/
by jsuchome＠svn.opensuse.org 22 Dec '09

22 Dec '09

Author: jsuchome Date: Tue Dec 22 14:37:44 2009 New Revision: 60177 URL: http://svn.opensuse.org/viewcvs/yast?rev=60177&view=rev Log: Created tag branch-Code-11-SP1-2_17_14 for add-on-creator Added: tags/branch-Code-11-SP1-2_17_14/add-on-creator/ (props changed) - copied from r60176, branches/SuSE-Code-11-SP1-Branch/add-on-creator/ -- 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] r60176 - in /trunk/add-on-creator: VERSION package/yast2-add-on-creator.changes src/AddOnCreator.ycp
by jsuchome＠svn.opensuse.org 22 Dec '09

22 Dec '09

Author: jsuchome Date: Tue Dec 22 14:37:40 2009 New Revision: 60176 URL: http://svn.opensuse.org/viewcvs/yast?rev=60176&view=rev Log: - added some path escaping - when generating new package descriptions, delete save entries of packages with same name (bnc#486041) - 2.19.1 Modified: trunk/add-on-creator/VERSION trunk/add-on-creator/package/yast2-add-on-creator.changes trunk/add-on-creator/src/AddOnCreator.ycp Modified: trunk/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/VERSION?rev=60176… ============================================================================== --- trunk/add-on-creator/VERSION (original) +++ trunk/add-on-creator/VERSION Tue Dec 22 14:37:40 2009 @@ -1 +1 @@ -2.19.0 +2.19.1 Modified: trunk/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/package/yast2-add… ============================================================================== --- trunk/add-on-creator/package/yast2-add-on-creator.changes (original) +++ trunk/add-on-creator/package/yast2-add-on-creator.changes Tue Dec 22 14:37:40 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Dec 22 14:17:04 CET 2009 - jsuchome(a)suse.cz + +- added some path escaping +- when generating new package descriptions, delete save entries of + packages with same name (bnc#486041) +- 2.19.1 + +------------------------------------------------------------------- Thu Nov 19 14:41:09 CET 2009 - jsuchome(a)suse.cz - add checksum of y2update.tgz to content file (bnc#556630) Modified: trunk/add-on-creator/src/AddOnCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/AddOnCreator.… ============================================================================== --- trunk/add-on-creator/src/AddOnCreator.ycp (original) +++ trunk/add-on-creator/src/AddOnCreator.ycp Tue Dec 22 14:37:40 2009 @@ -1481,7 +1481,7 @@ string rpm_path = current_product["rpm_path"]:""; // 1. find the used architectures - string cmd = sformat ("cd %1; find -maxdepth 1 -type d", rpm_path); + string cmd = sformat ("cd '%1'; find -maxdepth 1 -type d", rpm_path); map out = $[]; if (rpm_path != "") out = (map) SCR::Execute (.target.bash_output, cmd); @@ -1505,14 +1505,14 @@ // 2. get the list of architectures from RPM's if (rpm_path != "") out = (map) SCR::Execute (.target.bash_output, - sformat ("find %1 -name '*.rpm'", rpm_path)); + sformat ("find '%1' -name '*.rpm'", rpm_path)); y2milestone ("asking the RPM's for ARCH and NAME..."); // for which architectures are the packages built map<string,any> package_architectures = $[]; foreach (string f, splitstring (out["stdout"]:"", "\n"), { if (f == "") return; out = (map) SCR::Execute (.target.bash_output, - sformat ("rpm -q -p %1 --qf \"%%{ARCH}\n%%{NAME}\n%%|SOURCERPM?{bin}:{src}|\"",f)); + sformat ("rpm -q -p '%1' --qf \"%%{ARCH}\n%%{NAME}\n%%|SOURCERPM?{bin}:{src}|\"",f)); list lines = splitstring (out["stdout"]:"", "\n"); string arch = lines[0]:""; string name = lines[1]:""; @@ -1574,12 +1574,12 @@ if (required_rpm_path != "" && required_rpm_path != rpm_path) { out = (map) SCR::Execute (.target.bash_output, - sformat ("cd %1; find -name '*.rpm'", required_rpm_path)); + sformat ("cd '%1'; find -name '*.rpm'", required_rpm_path)); y2milestone ("asking the RPM's for NAME..."); list<string> inputs = create_argument_lists (out["stdout"]:""); string output = ""; foreach (string input, inputs, { - string cmd = sformat ("cd %1; rpm --qf \"%%{NAME}\n\" -qp %2", + string cmd = sformat ("cd '%1'; rpm --qf \"%%{NAME}\n\" -qp %2", required_rpm_path, input); out = (map) SCR::Execute (.target.bash_output, cmd); output = output + out["stdout"]:"" + "\n"; @@ -1718,6 +1718,7 @@ packages_descr[lang] = ReadPackagesFile (file); return; } + map package_names = mapmap (string p, map d, packages_descr[lang]:$[], ``($[ splitstring (p, " ")[0]:p : p])); // now, we need to merge old data from packages_descr with currently // generated ones (TODO this works only for packages.en) foreach (string p, map d, (map<string,map>) ReadPackagesFile (file), { @@ -1725,6 +1726,12 @@ { y2debug ("new package %1", d); packages_descr[lang,p] = d; + string name = splitstring (p, " ")[0]:p; + if (package_names[name]:"" != "") + { + y2milestone ("replacing saved '%1' with present '%2'", package_names[name]:"", p); + packages_descr[lang] = remove (packages_descr[lang]:$[], package_names[name]:""); + } } }); }); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0