Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at 2013-08-04 21:08:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-storage (Old) and /work/SRC/openSUSE:Factory/.yast2-storage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-storage" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-storage/yast2-storage.changes 2013-08-01 11:10:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes 2013-08-04 23:52:49.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Aug 01 13:27:43 CEST 2013 - [email protected] + +- use ruby dbus bindings instead of yast2-dbus-client + +------------------------------------------------------------------- +Thu Aug 1 12:26:11 CEST 2013 - [email protected] + +- fix add volumes to btrfs when format is true and primary volume + was not btrfs previously + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.QtChLM/_old 2013-08-04 23:52:50.000000000 +0200 +++ /var/tmp/diff_new_pack.QtChLM/_new 2013-08-04 23:52:50.000000000 +0200 @@ -30,6 +30,7 @@ BuildRequires: libtool BuildRequires: libxslt BuildRequires: perl-XML-Writer +BuildRequires: rubygem-ruby-dbus BuildRequires: sablot BuildRequires: sgml-skel BuildRequires: swig @@ -41,9 +42,9 @@ BuildRequires: yast2-testsuite >= 2.19.0 Requires: libstorage4 >= 2.24.0 Requires: perl = %{perl_version} +Requires: rubygem-ruby-dbus Requires: yast2 >= 2.19.4 Requires: yast2-core >= 2.18.3 -Requires: yast2-dbus-client >= 2.22.0 Requires: yast2-libyui >= 2.18.7 Requires: yast2-perl-bindings %ifarch s390 s390x ++++++ yast2-storage-3.0.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.0.0/Makefile.am.common new/yast2-storage-3.0.0/Makefile.am.common --- old/yast2-storage-3.0.0/Makefile.am.common 2013-07-31 11:00:48.000000000 +0200 +++ new/yast2-storage-3.0.0/Makefile.am.common 2013-08-02 17:29:14.000000000 +0200 @@ -30,10 +30,10 @@ dist-hook: check-syntax CHECK_SYNTAX = true -check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(filter %.ycp,client_DATA)"; then \ +check-syntax: $(client_DATA) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles) + @if test "$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; then \ if $(CHECK_SYNTAX); then \ - TO_CHECK="$(filter %.ycp,$^)"; \ + TO_CHECK="$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; \ echo "Checking syntax of $${TO_CHECK}"; \ if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ @@ -42,6 +42,20 @@ else \ echo "Syntax check disabled"; \ fi; \ + fi + @if test "$(filter %.rb, $^)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.rb, $^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + for f in $${TO_CHECK}; do \ + if ! ruby -c $$f > /dev/null; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + done; \ + else \ + echo "Syntax check disabled"; \ + fi; \ fi -include .dep diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.0.0/configure.ac new/yast2-storage-3.0.0/configure.ac --- old/yast2-storage-3.0.0/configure.ac 2013-07-31 11:00:48.000000000 +0200 +++ new/yast2-storage-3.0.0/configure.ac 2013-08-02 17:29:12.000000000 +0200 @@ -1,6 +1,6 @@ dnl configure.ac for yast2-storage dnl -dnl -- This file is generated by y2autoconf 2.24.7 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 3.0.1 - DO NOT EDIT! -- dnl (edit configure.ac.in or configure.in.in instead) AC_INIT(yast2-storage, 3.0.0, http://bugs.opensuse.org/, yast2-storage) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.0.0/src/Makefile.in new/yast2-storage-3.0.0/src/Makefile.in --- old/yast2-storage-3.0.0/src/Makefile.in 2013-07-31 11:01:01.000000000 +0200 +++ new/yast2-storage-3.0.0/src/Makefile.in 2013-08-02 17:29:27.000000000 +0200 @@ -840,10 +840,10 @@ rm ${NEWDEP} dist-hook: check-syntax -check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(filter %.ycp,client_DATA)"; then \ +check-syntax: $(client_DATA) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles) + @if test "$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; then \ if $(CHECK_SYNTAX); then \ - TO_CHECK="$(filter %.ycp,$^)"; \ + TO_CHECK="$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; \ echo "Checking syntax of $${TO_CHECK}"; \ if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ @@ -852,6 +852,20 @@ else \ echo "Syntax check disabled"; \ fi; \ + fi + @if test "$(filter %.rb, $^)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.rb, $^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + for f in $${TO_CHECK}; do \ + if ! ruby -c $$f > /dev/null; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + done; \ + else \ + echo "Syntax check disabled"; \ + fi; \ fi -include .dep diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.0.0/src/include/partitioning/ep-btrfs-lib.rb new/yast2-storage-3.0.0/src/include/partitioning/ep-btrfs-lib.rb --- old/yast2-storage-3.0.0/src/include/partitioning/ep-btrfs-lib.rb 2013-07-30 13:45:30.000000000 +0200 +++ new/yast2-storage-3.0.0/src/include/partitioning/ep-btrfs-lib.rb 2013-08-01 12:32:02.000000000 +0200 @@ -102,8 +102,10 @@ Builtins.foreach(devs) do |dev| Storage.SetPartitionId(dev, Partitions.fsid_native) - Storage.SetPartitionFormat(dev, false, :none) - ret = false if !Storage.ExtendBtrfsVolume(device, dev) + if dev!=device + Storage.SetPartitionFormat(dev, false, :none) + ret = false if !Storage.ExtendBtrfsVolume(device, dev) + end end ret end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.0.0/src/include/partitioning/ep-main.rb new/yast2-storage-3.0.0/src/include/partitioning/ep-main.rb --- old/yast2-storage-3.0.0/src/include/partitioning/ep-main.rb 2013-07-30 13:45:30.000000000 +0200 +++ new/yast2-storage-3.0.0/src/include/partitioning/ep-main.rb 2013-08-02 10:11:52.000000000 +0200 @@ -108,11 +108,11 @@ end - def MakeNavigationTree(open_items, tree, data) + def MakeNavigationTree(open_items) open_items = deep_copy(open_items) # TODO: somehow use AlwaysHideDisk - data.value = { + data = { :all => { :create => fun_ref(method(:CreateAllPanel), "void (any)"), :handle => fun_ref(method(:HandleAllPanel), "void (any, map)") @@ -211,8 +211,8 @@ tmp, Item(Id(part_device), part_displayname, open.call(part_device)) ) - data.value = Builtins.add( - data.value, + data = Builtins.add( + data, part_device, Builtins.union(a, { :user_data => part_device }) ) @@ -233,8 +233,8 @@ ) ) ) - data.value = Builtins.add( - data.value, + data = Builtins.add( + data, disk_device, Builtins.union(b, { :user_data => disk_device }) ) @@ -368,7 +368,7 @@ short_hostname = Hostname.CurrentHostname # TODO: same ordering as with IterateTargetMap - tree.value = [ + tree = [ Item( Id(:all), term(:icon, StorageIcons.all_icon), @@ -449,8 +449,8 @@ if UI.HasSpecialWidget(:Graph) # tree node label - tree.value = Builtins.add( - tree.value, + tree = Builtins.add( + tree, Item( Id(:devicegraph), term(:icon, StorageIcons.graph_icon), @@ -459,8 +459,8 @@ ) ) # tree node label - tree.value = Builtins.add( - tree.value, + tree = Builtins.add( + tree, Item( Id(:mountgraph), term(:icon, StorageIcons.graph_icon), @@ -472,8 +472,8 @@ # tree node label - tree.value = Builtins.add( - tree.value, + tree = Builtins.add( + tree, Item( Id(:summary), term(:icon, StorageIcons.summary_icon), @@ -483,8 +483,8 @@ ) # tree node label - tree.value = Builtins.add( - tree.value, + tree = Builtins.add( + tree, Item( Id(:settings), term(:icon, StorageIcons.settings_icon), @@ -495,8 +495,8 @@ if Mode.normal # tree node label - tree.value = Builtins.add( - tree.value, + tree = Builtins.add( + tree, Item( Id(:log), term(:icon, StorageIcons.log_icon), @@ -506,22 +506,24 @@ ) end - nil + return tree, data + end + + def UpdateNavigationTree(new_focus) new_focus = deep_copy(new_focus) - tree = [] - data = {} + open_items = Convert.to_map(UI.QueryWidget(Id(:tree), :OpenItems)) - tree_ref = arg_ref(tree) - data_ref = arg_ref(data) - MakeNavigationTree(open_items, tree_ref, data_ref) - tree = tree_ref.value - data = data_ref.value + + tree, data = MakeNavigationTree(open_items) + TreePanel.Update(data, tree, new_focus) nil end + + def EpContextMenuDevice(device) target_map = Storage.GetTargetMap @@ -659,13 +661,7 @@ Storage.CreateTargetBackup("expert-partitioner") - tree = [] - data = {} - tree_ref = arg_ref(tree) - data_ref = arg_ref(data) - MakeNavigationTree({ :all => "ID" }, tree_ref, data_ref) - tree = tree_ref.value - data = data_ref.value + tree, data = MakeNavigationTree({ :all => "ID" }) back_label = Label.BackButton next_label = Mode.normal ? Label.FinishButton : Label.AcceptButton diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.0.0/src/modules/Storage.rb new/yast2-storage-3.0.0/src/modules/Storage.rb --- old/yast2-storage-3.0.0/src/modules/Storage.rb 2013-07-30 13:45:30.000000000 +0200 +++ new/yast2-storage-3.0.0/src/modules/Storage.rb 2013-08-01 13:41:52.000000000 +0200 @@ -41,6 +41,7 @@ # # $Id$ require "yast" +require "dbus" module Yast class StorageClass < Module @@ -8172,36 +8173,29 @@ nil end + def SwitchUiAutomounter(on) Builtins.y2milestone("SwitchUiAutomounter on:%1", on) - if !on - tmp = SCR.Execute( - path(".dbus.system.method"), - { - :destination => "org.freedesktop.UDisks", - :path => "/org/freedesktop/UDisks", - :interface => "org.freedesktop.UDisks", - :method => "Inhibit" - }, - [] - ) - @dbus_cookie = Ops.get_string(Convert.to_list(tmp), 0, "") - else - tmp = SCR.Execute( - path(".dbus.system.method"), - { - :destination => "org.freedesktop.UDisks", - :path => "/org/freedesktop/UDisks", - :interface => "org.freedesktop.UDisks", - :method => "Uninhibit" - }, - [@dbus_cookie] - ) - @dbus_cookie = nil - end + begin - Builtins.y2milestone("SwitchUiAutomounter exit") + system_bus = DBus::SystemBus.instance + service = system_bus.service("org.freedesktop.UDisks") + dbus_object = service.object("/org/freedesktop/UDisks") + dbus_object.default_iface = "org.freedesktop.UDisks" + dbus_object.introspect + + if !on + @dbus_cookie = dbus_object.Inhibit().first + else + dbus_object.Uninhibit(@dbus_cookie) + @dbus_cookie = nil + end + + rescue Exception => e + Builtins.y2error("SwitchUiAutomounter failed %1", e.message) + + end nil end -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
