Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at 2013-12-18 16:56:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-12-05 07:18:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes 2013-12-18 16:56:04.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Dec 16 12:15:43 CET 2013 - [email protected] + +- fixed default btrfs subvolume for SLE +- version 3.1.4 + +------------------------------------------------------------------- Old: ---- yast2-storage-3.1.3.tar.bz2 New: ---- yast2-storage-3.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.UuUFSK/_old 2013-12-18 16:56:05.000000000 +0100 +++ /var/tmp/diff_new_pack.UuUFSK/_new 2013-12-18 16:56:05.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -36,7 +36,7 @@ BuildRequires: update-desktop-files BuildRequires: yast2 >= 2.19.4 BuildRequires: yast2-core-devel >= 2.23.1 -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2-testsuite >= 2.19.0 Requires: libstorage-ruby >= 2.25.4 Requires: libstorage5 >= 2.25.4 ++++++ yast2-storage-3.1.3.tar.bz2 -> yast2-storage-3.1.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.3/VERSION new/yast2-storage-3.1.4/VERSION --- old/yast2-storage-3.1.3/VERSION 2013-12-04 10:21:37.000000000 +0100 +++ new/yast2-storage-3.1.4/VERSION 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -3.1.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.3/package/yast2-storage.changes new/yast2-storage-3.1.4/package/yast2-storage.changes --- old/yast2-storage-3.1.3/package/yast2-storage.changes 2013-12-04 10:21:37.000000000 +0100 +++ new/yast2-storage-3.1.4/package/yast2-storage.changes 2013-12-16 16:04:01.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Dec 16 12:15:43 CET 2013 - [email protected] + +- fixed default btrfs subvolume for SLE +- version 3.1.4 + +------------------------------------------------------------------- Tue Dec 03 17:40:26 CET 2013 - [email protected] - import complete used-by list from libstorage in target-map diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.3/package/yast2-storage.spec new/yast2-storage-3.1.4/package/yast2-storage.spec --- old/yast2-storage-3.1.3/package/yast2-storage.spec 2013-12-04 10:21:37.000000000 +0100 +++ new/yast2-storage-3.1.4/package/yast2-storage.spec 2013-12-16 16:04:01.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -31,7 +31,7 @@ BuildRequires: libstorage-devel >= 2.25.4 BuildRequires: yast2 >= 2.19.4 BuildRequires: yast2-core-devel >= 2.23.1 -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2-testsuite >= 2.19.0 BuildRequires: rubygem-ruby-dbus BuildRequires: libstorage-ruby >= 2.25.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.3/src/modules/FileSystems.rb new/yast2-storage-3.1.4/src/modules/FileSystems.rb --- old/yast2-storage-3.1.3/src/modules/FileSystems.rb 2013-12-04 10:21:37.000000000 +0100 +++ new/yast2-storage-3.1.4/src/modules/FileSystems.rb 2013-12-16 16:04:01.000000000 +0100 @@ -1405,12 +1405,7 @@ def InitSlib(value) @sint = value if @sint != nil - ret = @sint.getDefaultSubvolName - Builtins.y2milestone("InitSlib libstorage default_subvol:\"%1\"", ret) - ret = "" - @sint.setDefaultSubvolName(ret) - ret = @sint.getDefaultSubvolName - @default_subvol = ret + @default_subvol = @sint.getDefaultSubvolName() Builtins.y2milestone( "InitSlib used default_subvol:\"%1\"", @default_subvol @@ -1420,6 +1415,7 @@ nil end + def assertInit if @sint == nil @sint = StorageInit.CreateInterface(false) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.3/src/modules/Storage.rb new/yast2-storage-3.1.4/src/modules/Storage.rb --- old/yast2-storage-3.1.3/src/modules/Storage.rb 2013-12-04 10:21:37.000000000 +0100 +++ new/yast2-storage-3.1.4/src/modules/Storage.rb 2013-12-16 16:04:01.000000000 +0100 @@ -71,6 +71,7 @@ Yast.import "Stage" Yast.import "String" Yast.import "Hotplug" + Yast.import "ProductFeatures" # simple resize functionality - dialog to set size of Linux and Windows before proposal @@ -345,6 +346,10 @@ StorageClients.InstallCallbacks(@sint) + btrfs_default_subvolume = ProductFeatures.GetStringFeature("partitioning", + "btrfs_default_subvolume") + @sint.setDefaultSubvolName(btrfs_default_subvolume) if btrfs_default_subvolume + if Stage.initial @sint.setDetectMountedVolumes(false) @sint.setRootPrefix(Installation.destdir) @@ -1289,32 +1294,37 @@ d = deep_copy(d) dinfo = infos.d d = diskMap(dinfo, d) - ls = [] - infos.devices.each { |device| ls.push(device) } - Ops.set(d, "devices", ls) + d["devices"] = infos.devices.to_a Ops.set(d, "minor", infos.minor) Builtins.y2milestone("dmPartCoMap ret:%1", d) deep_copy(d) end - def usedbyMap(d) + def deviceMap(info) + + ret = { + "device" => info.device, + "name" => info.name + } tmp = [] - d.usedBy.each do |used_by| + info.usedBy.each do |used_by| tmp.push({ "type" => toSymbol(@conv_usedby, used_by.type), "device" => used_by.device }) end - ret = { "used_by" => tmp } - if tmp.empty? ret["used_by_type"] = :UB_NONE ret["used_by_device"] = "" else + ret["used_by"] = tmp ret["used_by_type"] = tmp[0]["type"] ret["used_by_device"] = tmp[0]["device"] end + ret["udev_path"] = info.udevPath if !info.udevPath.empty? + ret["udev_id"] = info.udevId.to_a if !info.udevId.empty? + return ret end @@ -1322,11 +1332,10 @@ def volumeMap(vinfo, p) p = deep_copy(p) - Ops.set(p, "device", vinfo.device) + p.merge!(deviceMap(vinfo)) tmp = vinfo.crypt_device Ops.set(p, "crypt_device", tmp) if !Builtins.isempty(tmp) Ops.set(p, "size_k", vinfo.sizeK) - Ops.set(p, "name", vinfo.name) fs = toSymbol(FileSystems.conv_fs, vinfo.fs) Ops.set(p, "used_fs", fs) if fs != :unknown fs = toSymbol(FileSystems.conv_fs, vinfo.detected_fs) @@ -1340,8 +1349,6 @@ Ops.set(p, "mountby", toSymbol(@conv_mountby, vinfo.mount_by)) end - p.merge!(usedbyMap(vinfo)) - tmp = vinfo.fstab_options if !Builtins.isempty(tmp) Ops.set(p, "fstopt", tmp) @@ -1400,14 +1407,6 @@ tmp = vinfo.loop Ops.set(p, "loop", tmp) if !Builtins.isempty(tmp) - p["udev_path"] = vinfo.udevPath if !vinfo.udevPath.empty? - - if !vinfo.udevId.empty? - tmp = [] - vinfo.udevId.each { |udev_id| tmp.push(udev_id) } - p["udev_id"] = tmp - end - deep_copy(p) end @@ -1590,13 +1589,8 @@ ) end - ls = [] - infos.devices.each { |device| ls.push(device) } - Ops.set(c, "devices", ls) - - ls = [] - infos.spares.each { |spare| ls.push(spare) } - Ops.set(c, "spares", ls) if !Builtins.isempty(ls) + c["devices"] = infos.devices.to_a + c["spares" ] = infos.spares.to_a if !infos.spares.empty? t2 = infos.type Ops.set( @@ -1645,20 +1639,10 @@ Ops.set(c, "cyl_count", infos.peCount) Ops.set(c, "pe_free", infos.peFree) Ops.set(c, "lvm2", infos.lvm2) - ls = [] - infos.devices.each { |device| ls.push(device) } - Builtins.y2milestone("ls=%1", ls) - Ops.set(c, "devices", ls) - ls = [] - infos.devices_add.each { |device_add| ls.push(device_add) } - if !Builtins.isempty(ls) - Ops.set(c, "devices_add", ls) - end - ls = [] - infos.devices_rem.each { |device_rem| ls.push(device_rem) } - if !Builtins.isempty(ls) - Ops.set(c, "devices_rem", ls) - end + + c["devices"] = infos.devices.to_a + c["devices_add"] = infos.devices_add.to_a if !infos.devices_add.empty? + c["devices_rem"] = infos.devices_rem.to_a if !infos.devices_rem.empty? else Builtins.y2warning( "LVM Vg \"%1\" ret:%2", @@ -1721,12 +1705,10 @@ Ops.set(p, "chunk_size", t2) if t2>0 Ops.set(p, "sb_ver", info.sb_ver) Ops.set(p, "raid_inactive", true) if info.inactive - ls = [] - info.devices.each { |device| ls.push(device) } - Ops.set(p, "devices", ls) - ls = [] - info.spares.each { |spare| ls.push(spare) } - Ops.set(p, "spares", ls) if !Builtins.isempty(ls) + + p["devices"] = info.devices.to_a + p["spares"] = info.spares.to_a if !info.spares.empty + Ops.set( c, "partitions", @@ -1803,19 +1785,11 @@ p = volumeMap(vinfo, p) Ops.set(p, "type", :btrfs) Ops.set(p, "fstype", Partitions.btrfs_name) - ls = [] - info.devices.each { |device| ls.push(device) } - Ops.set(p, "devices", ls) - ls = [] - info.devices_add.each { |device_add| ls.push(device_add) } - if !Builtins.isempty(ls) - Ops.set(c, "devices_add", ls) - end - ls = [] - info.devices_rem.each { |device_rem| ls.push(device_rem) } - if !Builtins.isempty(ls) - Ops.set(c, "devices_rem", ls) - end + + p["devices"] = info.devices.to_a + p["devices_add"] = info.devices_add.to_a if !info.devices_add.empty? + p["devices_rem"] = info.devices_rem.to_a if !info.devices_rem.empty? + li = [] Ops.set(p, "subvol", li) ls = [] @@ -1941,26 +1915,10 @@ cinfos = ::Storage::DequeContainerInfo.new() @sint.getContainers(cinfos) cinfos.each do |info| - c = {} - Ops.set(c, "name", info.name) - Ops.set(c, "device", info.device) - t = info.type - Ops.set(c, "type", toSymbol(@conv_ctype, t)) - - c.merge!(usedbyMap(info)) - + c = deviceMap(info) + c["type"] = toSymbol(@conv_ctype, info.type) Builtins.y2milestone("c:%1",c) - b = info.readonly - Ops.set(c, "readonly", true) if b - - c["udev_path"] = info.udevPath if !info.udevPath.empty? - - if !info.udevId.empty? - tmp = [] - info.udevId.each { |udev_id| tmp.push(udev_id) } - c["udev_id"] = tmp - end - + c["readonly"] = true if info.readonly ret = Builtins.add(ret, c) end Builtins.y2milestone("getContainers ret:%1", ret) @@ -4511,10 +4469,7 @@ r = ::Storage::ListString.new(); res = @sint.getRecursiveUsing(devs, false, r); Builtins.y2milestone("GetAffectedDevices dev:%1 ret:%2", dev, res) - ret = [] - r.each do |s| - ret.push(s) - end + ret = r.to_a Builtins.y2milestone("GetAffectedDevices ret:%1", ret) ret end @@ -5801,11 +5756,8 @@ def GetUsedFs return nil if !InitLibstorage(false) - ret = [] r = @sint.getAllUsedFs() - r.each do |s| - ret.push(s) - end + ret = r.to_a Builtins.y2milestone( "GetUsedFs ret:%1", ret ) ret end @@ -7069,11 +7021,8 @@ def GetDetectedDiskPaths - ret = [] disks = ::Storage::getPresentDisks - disks.each do |d| - ret.push(d) - end + ret = disks.to_a Builtins.y2milestone("disks:%1", ret) ret end -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
