Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at 2014-07-25 12:37:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-07-11 20:05:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes 2014-07-25 12:37:16.000000000 +0200 @@ -1,0 +2,17 @@ +Tue Jul 22 10:23:00 CEST 2014 - [email protected] + +- disable btrfs quota again (see bnc#887046) +- version 3.1.39 + +------------------------------------------------------------------- +Tue Jul 15 13:55:00 CEST 2014 - [email protected] + +- fixed importing mount points (bnc#887155) +- version 3.1.38 + +------------------------------------------------------------------- +Mon Jul 14 16:07:49 CEST 2014 - [email protected] + +- fixed initialisation of btrfs subvolumes (bnc#872210) + +------------------------------------------------------------------- @@ -6,0 +24,6 @@ + +------------------------------------------------------------------- +Mon Jul 7 09:37:11 UTC 2014 - [email protected] + +- switch to rubygem() based requires so we can easily pass the + preferred ruby version using rb_default_ruby_abi Old: ---- yast2-storage-3.1.37a.tar.bz2 New: ---- yast2-storage-3.1.39.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.q0DxVx/_old 2014-07-25 12:37:17.000000000 +0200 +++ /var/tmp/diff_new_pack.q0DxVx/_new 2014-07-25 12:37:17.000000000 +0200 @@ -17,11 +17,11 @@ Name: yast2-storage -Version: 3.1.37 +Version: 3.1.39 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: %{name}-%{version}a.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 BuildRequires: docbook-xsl-stylesheets BuildRequires: doxygen @@ -31,8 +31,13 @@ BuildRequires: libtool BuildRequires: libxslt BuildRequires: perl-XML-Writer +%if 0%{?suse_version} == 1315 +BuildRequires: rubygem(%{rb_default_ruby_abi}:rspec) +BuildRequires: rubygem(%{rb_default_ruby_abi}:ruby-dbus) +%else BuildRequires: rubygem-rspec BuildRequires: rubygem-ruby-dbus +%endif BuildRequires: sgml-skel BuildRequires: update-desktop-files BuildRequires: yast2 >= 3.1.22 @@ -42,7 +47,11 @@ BuildRequires: yast2-testsuite >= 2.19.0 Requires: libstorage-ruby >= 2.25.14 Requires: libstorage5 >= 2.25.14 +%if 0%{?suse_version} == 1315 +Requires: rubygem(%{rb_default_ruby_abi}:ruby-dbus) +%else Requires: rubygem-ruby-dbus +%endif Requires: yast2 >= 3.1.22 Requires: yast2-core >= 2.18.3 Requires: yast2-libyui >= 2.18.7 ++++++ yast2-storage-3.1.37a.tar.bz2 -> yast2-storage-3.1.39.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.37/package/yast2-storage.changes new/yast2-storage-3.1.39/package/yast2-storage.changes --- old/yast2-storage-3.1.37/package/yast2-storage.changes 2014-07-10 12:59:28.000000000 +0200 +++ new/yast2-storage-3.1.39/package/yast2-storage.changes 2014-07-24 15:14:15.000000000 +0200 @@ -1,4 +1,21 @@ ------------------------------------------------------------------- +Tue Jul 22 10:23:00 CEST 2014 - [email protected] + +- disable btrfs quota again (see bnc#887046) +- version 3.1.39 + +------------------------------------------------------------------- +Tue Jul 15 13:55:00 CEST 2014 - [email protected] + +- fixed importing mount points (bnc#887155) +- version 3.1.38 + +------------------------------------------------------------------- +Mon Jul 14 16:07:49 CEST 2014 - [email protected] + +- fixed initialisation of btrfs subvolumes (bnc#872210) + +------------------------------------------------------------------- Thu Jul 10 12:25:03 CEST 2014 - [email protected] - fixed creating extended partitions in expert partitioner @@ -6,6 +23,12 @@ - version 3.1.37 ------------------------------------------------------------------- +Mon Jul 7 09:37:11 UTC 2014 - [email protected] + +- switch to rubygem() based requires so we can easily pass the + preferred ruby version using rb_default_ruby_abi + +------------------------------------------------------------------- Fri Jul 04 14:30:52 CEST 2014 - [email protected] - added extra dialog to select role of device (fate#317140) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.37/package/yast2-storage.spec new/yast2-storage-3.1.39/package/yast2-storage.spec --- old/yast2-storage-3.1.37/package/yast2-storage.spec 2014-07-10 12:59:28.000000000 +0200 +++ new/yast2-storage-3.1.39/package/yast2-storage.spec 2014-07-24 15:14:15.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 3.1.37 +Version: 3.1.39 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -33,8 +33,13 @@ BuildRequires: libstorage-ruby >= 2.25.14 BuildRequires: libxslt BuildRequires: perl-XML-Writer +%if 0%{?suse_version} == 1315 +BuildRequires: rubygem(%{rb_default_ruby_abi}:rspec) +BuildRequires: rubygem(%{rb_default_ruby_abi}:ruby-dbus) +%else BuildRequires: rubygem-rspec BuildRequires: rubygem-ruby-dbus +%endif BuildRequires: sgml-skel BuildRequires: update-desktop-files BuildRequires: yast2 >= 3.1.22 @@ -44,7 +49,11 @@ BuildRequires: yast2-testsuite >= 2.19.0 Requires: libstorage-ruby >= 2.25.14 Requires: libstorage5 >= 2.25.14 +%if 0%{?suse_version} == 1315 +Requires: rubygem(%{rb_default_ruby_abi}:ruby-dbus) +%else Requires: rubygem-ruby-dbus +%endif Requires: yast2 >= 3.1.22 Requires: yast2-core >= 2.18.3 Requires: yast2-libyui >= 2.18.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.37/src/include/partitioning/custom_part_dialogs.rb new/yast2-storage-3.1.39/src/include/partitioning/custom_part_dialogs.rb --- old/yast2-storage-3.1.37/src/include/partitioning/custom_part_dialogs.rb 2014-07-10 12:59:28.000000000 +0200 +++ new/yast2-storage-3.1.39/src/include/partitioning/custom_part_dialogs.rb 2014-07-24 15:14:15.000000000 +0200 @@ -1681,7 +1681,10 @@ begin ret = UI.UserInput Builtins.y2milestone("SubvolHandling ret %1", ret) - if ret == :remove + + case ret + + when :remove pth = Convert.to_string(UI.QueryWidget(Id(:subvol), :CurrentItem)) Builtins.y2milestone("SubvolHandling remove path:%1", pth) Builtins.y2milestone( @@ -1707,8 +1710,8 @@ Builtins.y2milestone("SubvolHandling remove items:%1", items) changed = true UI.ChangeWidget(Id(:subvol), :Items, items) - end - if ret == :add + + when :add pth = Convert.to_string(UI.QueryWidget(Id(:new_path), :Value)) svtmp = Ops.add(FileSystems.default_subvol, "/") Builtins.y2milestone( @@ -1728,6 +1731,7 @@ svtmp ) Popup.Message(tmp) + pth = svtmp + pth end if Builtins.contains(SubvolNames(new), pth) Popup.Message( @@ -1747,9 +1751,8 @@ items = SubvolNames(new) UI.ChangeWidget(Id(:subvol), :Items, items) UI.ChangeWidget(Id(:new_path), :Value, "") - end - if ret == :ok + when :ok val = UI.QueryWidget(Id(:snapshots), :Value) if val old_userdata["/"] = "snapshots" @@ -1757,9 +1760,8 @@ old_userdata.delete("/") end Ops.set(new, "userdata", old_userdata) - end - if ret == :cancel + when :cancel if changed if Popup.YesNo( _("Modifications done so far in this dialog will be lost.") @@ -1769,7 +1771,9 @@ ret = :again end end + end + end until ret == :ok || ret == :cancel UI.CloseDialog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.37/src/include/partitioning/custom_part_lib.rb new/yast2-storage-3.1.39/src/include/partitioning/custom_part_lib.rb --- old/yast2-storage-3.1.37/src/include/partitioning/custom_part_lib.rb 2014-07-10 12:59:28.000000000 +0200 +++ new/yast2-storage-3.1.39/src/include/partitioning/custom_part_lib.rb 2014-07-24 15:14:15.000000000 +0200 @@ -694,6 +694,12 @@ UI.ChangeWidget(Id(:fstab_options), :Enabled, !Builtins.isempty(mp)) end end + + # set btrfs subvolumes (bnc#872210) + if init + new = HandleSubvol(new) + end + if init && UI.WidgetExists(Id(:format)) || ret == :do_format || ret == :do_not_format format = UI.QueryWidget(Id(:format), :Value) == :do_format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.37/src/include/partitioning/ep-dialogs.rb new/yast2-storage-3.1.39/src/include/partitioning/ep-dialogs.rb --- old/yast2-storage-3.1.37/src/include/partitioning/ep-dialogs.rb 2014-07-10 12:59:28.000000000 +0200 +++ new/yast2-storage-3.1.39/src/include/partitioning/ep-dialogs.rb 2014-07-24 15:14:15.000000000 +0200 @@ -249,6 +249,7 @@ data["fsid"] = Partitions.fsid_swap data["ori_fsid"] = Partitions.fsid_swap data["used_fs"] = used_fs + data["mount"] = mount_point_proposal when :raw mount_point_proposal = "" @@ -274,6 +275,7 @@ data["fsid"] = Partitions.fsid_native data["ori_fsid"] = Partitions.fsid_native data["used_fs"] = used_fs + data["mount"] = mount_point_proposal end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.37/src/include/partitioning/ep-import.rb new/yast2-storage-3.1.39/src/include/partitioning/ep-import.rb --- old/yast2-storage-3.1.37/src/include/partitioning/ep-import.rb 2014-07-10 12:59:28.000000000 +0200 +++ new/yast2-storage-3.1.39/src/include/partitioning/ep-import.rb 2014-07-24 15:14:15.000000000 +0200 @@ -229,7 +229,7 @@ fstab.each do |fstab_entry| type_fstab = fstab_entry["detected_fs"] - opts_fstab = fstab_entry["fstopt"] + opts_fstab = fstab_entry.fetch("fstopt", "") # YaST cannot handle multiple mount points per device so ignore all # subvolume mounts (bnc #874288) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.37/src/include/partitioning/partition_defines.rb new/yast2-storage-3.1.39/src/include/partitioning/partition_defines.rb --- old/yast2-storage-3.1.37/src/include/partitioning/partition_defines.rb 2014-07-10 12:59:28.000000000 +0200 +++ new/yast2-storage-3.1.39/src/include/partitioning/partition_defines.rb 2014-07-24 15:14:15.000000000 +0200 @@ -103,7 +103,7 @@ free_list = notUsedMountpoints( Storage.GetTargetMap, FileSystems.SuggestMPoints - ) # = filter( string point, base, + ) return Ops.get_string(free_list, 0, "") end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.37/src/modules/FileSystems.rb new/yast2-storage-3.1.39/src/modules/FileSystems.rb --- old/yast2-storage-3.1.37/src/modules/FileSystems.rb 2014-07-10 12:59:28.000000000 +0200 +++ new/yast2-storage-3.1.39/src/modules/FileSystems.rb 2014-07-24 15:14:15.000000000 +0200 @@ -456,15 +456,16 @@ Ops.get(order_m_mpoints, b, 99) ) end - Builtins.y2milestone("SuggestMPoints init:%1", @suggest_m_points) + Builtins.y2milestone("SuggestMPoints ret:%1", @suggest_m_points) end deep_copy(@suggest_m_points) end - def SuggesTmpfsMPoints + + def SuggestTmpfsMPoints if Builtins.size(@suggest_tmp_points) == 0 @suggest_tmp_points = ["/run", "/var/run", "/tmp", "/var/lock"] - Builtins.y2milestone("SuggesTmpfsMPoints init:%1", @suggest_tmp_points) + Builtins.y2milestone("SuggestTmpfsMPoints ret:%1", @suggest_tmp_points) end deep_copy(@suggest_tmp_points) end @@ -1296,7 +1297,7 @@ }, :tmpfs => { :name => "TmpFS", - :mountpoints => SuggesTmpfsMPoints(), + :mountpoints => SuggestTmpfsMPoints(), :mount_string => "tmpfs", :mount_option => "-t tmpfs", :fst_options => @tmpfs_fst_options @@ -2016,7 +2017,7 @@ publish :variable => :default_subvol, :type => "string" publish :variable => :nchars, :type => "string" publish :function => :SuggestMPoints, :type => "list <string> ()" - publish :function => :SuggesTmpfsMPoints, :type => "list <string> ()" + publish :function => :SuggestTmpfsMPoints, :type => "list <string> ()" publish :function => :GetGeneralFstabOptions, :type => "list <map <symbol, any>> ()" publish :function => :GetJournalFstabOptions, :type => "list <map <symbol, any>> ()" publish :function => :GetAclFstabOptions, :type => "list <map <symbol, any>> ()" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.37/src/modules/Storage.rb new/yast2-storage-3.1.39/src/modules/Storage.rb --- old/yast2-storage-3.1.37/src/modules/Storage.rb 2014-07-10 12:59:28.000000000 +0200 +++ new/yast2-storage-3.1.39/src/modules/Storage.rb 2014-07-24 15:14:15.000000000 +0200 @@ -4992,7 +4992,7 @@ fmt = part.fetch("format",false) names = [] if !fmt - names = ls.select { |s| !s.fetch("delete",false) }.each { |s| s.fetch("name","") } + names = lst.select { |s| !s.fetch("delete", false) }.each { |s| s.fetch("name", "") } else lst = [] end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.37/src/modules/StorageUtils.rb.orig new/yast2-storage-3.1.39/src/modules/StorageUtils.rb.orig --- old/yast2-storage-3.1.37/src/modules/StorageUtils.rb.orig 2014-07-10 12:59:28.000000000 +0200 +++ new/yast2-storage-3.1.39/src/modules/StorageUtils.rb.orig 1970-01-01 01:00:00.000000000 +0100 @@ -1,73 +0,0 @@ -# encoding: utf-8 - -# Copyright (c) [2012-2014] Novell, Inc. -# -# All Rights Reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of version 2 of the GNU General Public License as published -# by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, contact Novell, Inc. -# -# To contact Novell about this file by physical or electronic mail, you may -# find current contact information at www.novell.com. - - -require "yast" - - -module Yast - - class StorageUtilsClass < Module - - - include Yast::Logger - - - def main - - textdomain "storage" - - Yast.import "Storage" - - end - - - def ConfigureSnapper() - part = Storage.GetEntryForMountpoint("/") - if part.fetch("used_fs", :unknown) == :btrfs - userdata = part.fetch("userdata", {}) - if userdata.fetch("/", "") == "snapshots" - log.info("configuring snapper for root fs") - if SCR.Execute(path(".target.bash"), "/usr/bin/snapper --no-dbus create-config " << - "--fstype=btrfs --add-fstab /") == 0 - SCR.Execute(path(".target.bash"), "/usr/bin/snapper --no-dbus set-config " << - "NUMBER_CLEANUP=yes NUMBER_LIMIT=10 NUMBER_LIMIT_IMPORTANT=10 " << - "TIMELINE_CREATE=no") - SCR.Write(path(".sysconfig.yast2.USE_SNAPPER"), "yes") - - SCR.Execute(path(".target.bash"), "/sbin/btrfs quota enable /") - SCR.Execute(path(".target.bash"), "/sbin/btrfs qgroup create 1/0 /") - SCR.Execute(path(".target.bash"), "/usr/bin/snapper --no-dbus set-config QGROUP=1/0") - - SCR.Write(path(".sysconfig.yast2"), nil) - else - log.error("configuring snapper for root fs failed") - end - end - end - end - - end - - StorageUtils = StorageUtilsClass.new - StorageUtils.main - -end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.37/test/storage_utils_configure_snapper_test.rb.orig new/yast2-storage-3.1.39/test/storage_utils_configure_snapper_test.rb.orig --- old/yast2-storage-3.1.37/test/storage_utils_configure_snapper_test.rb.orig 2014-07-10 12:59:28.000000000 +0200 +++ new/yast2-storage-3.1.39/test/storage_utils_configure_snapper_test.rb.orig 1970-01-01 01:00:00.000000000 +0100 @@ -1,56 +0,0 @@ -#!/usr/bin/rspec - -ENV["Y2DIR"] = File.expand_path("../../src", __FILE__) - -require "yast" - -Yast.import "StorageUtils" - - -describe "StorageUtils#ConfigureSnapper" do - - - it "configures snapper" do - - data = { - "device" => "/dev/sda1", - "mount" => "/", - "used_fs" => :btrfs, - "userdata" => { "/" => "snapshots" } - } - - Yast::Storage.stub(:GetEntryForMountpoint).with("/").once.and_return(data) - - Yast::SCR.stub(:Execute).and_return(1) - Yast::SCR.should_receive(:Execute).exactly(5).times.and_return(0) - - Yast::SCR.stub(:Write).and_return(1) - Yast::SCR.should_receive(:Write).exactly(2).times.and_return(0) - - Yast::StorageUtils.ConfigureSnapper() - - end - - - it "does not configure snapper" do - - data = { - "device" => "/dev/sda1", - "mount" => "/", - "used_fs" => :btrfs - } - - Yast::Storage.stub(:GetEntryForMountpoint).with("/").once.and_return(data) - - Yast::SCR.stub(:Execute).and_return(1) - Yast::SCR.should_receive(:Execute).exactly(0).times - - Yast::SCR.stub(:Write).and_return(1) - Yast::SCR.should_receive(:Write).exactly(0).times - - Yast::StorageUtils.ConfigureSnapper() - - end - - -end -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
