Hello community,
here is the log from the commit of package yast2-storage for openSUSE:Factory
checked in at 2014-02-23 07:16:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-02-17 09:37:56.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes
2014-02-23 07:16:27.000000000 +0100
@@ -1,0 +2,12 @@
+Fri Feb 21 15:12:11 CET 2014 - aschn...@suse.de
+
+- fixed naming of new partitions on DASDs
+- adapted to libstorage change
+
+-------------------------------------------------------------------
+Tue Feb 18 16:14:50 CET 2014 - aschn...@suse.de
+
+- fixed reuse of swap for storage proposal (bnc#864257)
+- version 3.1.10
+
+-------------------------------------------------------------------
Old:
----
yast2-storage-3.1.9.tar.bz2
New:
----
yast2-storage-3.1.10.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.cdKafJ/_old 2014-02-23 07:16:28.000000000 +0100
+++ /var/tmp/diff_new_pack.cdKafJ/_new 2014-02-23 07:16:28.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-storage
-Version: 3.1.9
+Version: 3.1.10
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -26,8 +26,8 @@
BuildRequires: docbook-xsl-stylesheets
BuildRequires: doxygen
BuildRequires: gcc-c++
-BuildRequires: libstorage-devel >= 2.25.7
-BuildRequires: libstorage-ruby >= 2.25.7
+BuildRequires: libstorage-devel >= 2.25.8
+BuildRequires: libstorage-ruby >= 2.25.8
BuildRequires: libtool
BuildRequires: libxslt
BuildRequires: perl-XML-Writer
@@ -38,9 +38,10 @@
BuildRequires: yast2 >= 2.19.4
BuildRequires: yast2-core-devel >= 2.23.1
BuildRequires: yast2-devtools >= 3.1.10
+BuildRequires: yast2-ruby-bindings >= 3.1.7
BuildRequires: yast2-testsuite >= 2.19.0
-Requires: libstorage-ruby >= 2.25.7
-Requires: libstorage5 >= 2.25.7
+Requires: libstorage-ruby >= 2.25.8
+Requires: libstorage5 >= 2.25.8
Requires: rubygem-ruby-dbus
Requires: yast2 >= 2.19.4
Requires: yast2-core >= 2.18.3
@@ -61,7 +62,7 @@
Obsoletes: yast2-trans-inst-partitioning
Provides: y2t_inst-partitioning
Obsoletes: y2t_inst-partitioning
-Requires: yast2-ruby-bindings >= 1.0.0
+Requires: yast2-ruby-bindings >= 3.1.7
Summary: YaST2 - Storage Configuration
License: GPL-2.0
++++++ yast2-storage-3.1.9.tar.bz2 -> yast2-storage-3.1.10.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.1.9/package/yast2-storage.changes
new/yast2-storage-3.1.10/package/yast2-storage.changes
--- old/yast2-storage-3.1.9/package/yast2-storage.changes 2014-02-10
11:29:05.000000000 +0100
+++ new/yast2-storage-3.1.10/package/yast2-storage.changes 2014-02-21
18:04:47.000000000 +0100
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Fri Feb 21 15:12:11 CET 2014 - aschn...@suse.de
+
+- fixed naming of new partitions on DASDs
+- adapted to libstorage change
+
+-------------------------------------------------------------------
+Tue Feb 18 16:14:50 CET 2014 - aschn...@suse.de
+
+- fixed reuse of swap for storage proposal (bnc#864257)
+- version 3.1.10
+
+-------------------------------------------------------------------
Mon Feb 10 11:16:54 CET 2014 - aschn...@suse.de
- fixed variable lookup (bnc#862752)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.1.9/package/yast2-storage.spec
new/yast2-storage-3.1.10/package/yast2-storage.spec
--- old/yast2-storage-3.1.9/package/yast2-storage.spec 2014-02-10
11:29:05.000000000 +0100
+++ new/yast2-storage-3.1.10/package/yast2-storage.spec 2014-02-21
18:04:47.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-storage
-Version: 3.1.9
+Version: 3.1.10
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -28,16 +28,17 @@
BuildRequires: gcc-c++ libtool
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer
sgml-skel update-desktop-files
-BuildRequires: libstorage-devel >= 2.25.7
+BuildRequires: libstorage-devel >= 2.25.8
BuildRequires: yast2 >= 2.19.4
BuildRequires: yast2-core-devel >= 2.23.1
BuildRequires: yast2-devtools >= 3.1.10
BuildRequires: yast2-testsuite >= 2.19.0
BuildRequires: rubygem-ruby-dbus
BuildRequires: rubygem-rspec
-BuildRequires: libstorage-ruby >= 2.25.7
-Requires: libstorage5 >= 2.25.7
-Requires: libstorage-ruby >= 2.25.7
+BuildRequires: libstorage-ruby >= 2.25.8
+BuildRequires: yast2-ruby-bindings >= 3.1.7
+Requires: libstorage5 >= 2.25.8
+Requires: libstorage-ruby >= 2.25.8
Requires: yast2-core >= 2.18.3 yast2 >= 2.19.4 yast2-libyui >= 2.18.7
Requires: rubygem-ruby-dbus
%ifarch s390 s390x
@@ -52,7 +53,7 @@
Obsoletes: yast2-trans-inst-partitioning
Provides: y2t_inst-partitioning
Obsoletes: y2t_inst-partitioning
-Requires: yast2-ruby-bindings >= 1.0.0
+Requires: yast2-ruby-bindings >= 3.1.7
Summary: YaST2 - Storage Configuration
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-storage-3.1.9/src/include/partitioning/ep-hd-dialogs.rb
new/yast2-storage-3.1.10/src/include/partitioning/ep-hd-dialogs.rb
--- old/yast2-storage-3.1.9/src/include/partitioning/ep-hd-dialogs.rb
2014-02-10 11:29:05.000000000 +0100
+++ new/yast2-storage-3.1.10/src/include/partitioning/ep-hd-dialogs.rb
2014-02-21 18:04:47.000000000 +0100
@@ -1,6 +1,6 @@
# encoding: utf-8
-# Copyright (c) 2012 Novell, Inc.
+# Copyright (c) [2012-2014] Novell, Inc.
#
# All Rights Reserved.
#
@@ -23,12 +23,19 @@
# Package: yast2-storage
# Summary: Expert Partitioner
# Authors: Arvin Schnell <aschn...@suse.de>
+
module Yast
module PartitioningEpHdDialogsInclude
+
+
+ include Yast::Logger
+
+
def initialize_partitioning_ep_hd_dialogs(include_target)
textdomain "storage"
end
+
def MiniWorkflowStepPartitionTypeHelptext
# helptext
helptext = _("<p>Choose the partition type for the new partition.</p>")
@@ -38,7 +45,8 @@
def MiniWorkflowStepPartitionType(data)
- Builtins.y2milestone("MiniWorkflowStepPartitionType data:%1", data.value)
+
+ log.info("MiniWorkflowStepPartitionType data:#{data.value}")
type = Ops.get_symbol(data.value, "type", :unknown)
slots = Ops.get_map(data.value, "slots", {})
@@ -114,18 +122,17 @@
if widget == :next
Ops.set(data.value, "type", type)
- r = Storage.NextPartition(
- Ops.get_string(data.value, "disk_device", ""),
- Ops.get_symbol(data.value, "type", :none)
- )
- Ops.set(data.value, "device", Ops.get_string(r, "device", ""))
+ # get the largest slot of type
+ slot = data.value["slots"][type][0]
+
+ data.value["device"] = slot[:device]
if Builtins.haskey(data.value, "disk_udev_id")
Ops.set(
data.value,
"udev_id",
Builtins.maplist(Ops.get_list(data.value, "disk_udev_id", [])) do
|s|
- Builtins.sformat("%1-part%2", s, Ops.get_integer(r, "nr", 0))
+ "#{s}-part#{slot[:nr]}"
end
)
end
@@ -137,7 +144,7 @@
Builtins.sformat(
"%1-part%2",
Ops.get_string(data.value, "disk_udev_path", ""),
- Ops.get_integer(r, "nr", 0)
+ slot[:nr]
)
)
end
@@ -148,13 +155,9 @@
end
end
- Builtins.y2milestone(
- "MiniWorkflowStepPartitionType data:%1 ret:%2",
- data.value,
- widget
- )
+ log.info("MiniWorkflowStepPartitionType data:#{data.value}
ret:#{widget}")
- widget
+ return widget
end
@@ -167,26 +170,28 @@
def MiniWorkflowStepPartitionSize(data)
- Builtins.y2milestone("MiniWorkflowStepPartitionSize data:%1", data.value)
+
+ log.info("MiniWorkflowStepPartitionSize data:#{data.value}")
cyl_size = Ops.get_integer(data.value, "cyl_size", 0)
cyl_count = Ops.get_integer(data.value, "cyl_count", 0)
- slots = Ops.get_list(
- data.value,
- ["slots", Ops.get_symbol(data.value, "type", :unknown)],
- []
- )
- slot = Ops.get(slots, 0, [])
+
+ type = data.value["type"]
+
+ slots = data.value["slots"][type]
+
+ # get the largest slot
+ slot = slots[0]
region = Convert.convert(
- Ops.get(data.value, "region", slot),
+ Ops.get(data.value, "region", slot[:region]),
:from => "any",
:to => "list <integer>"
)
size_k = Ops.divide(Ops.multiply(Ops.get(region, 1, 0), cyl_size), 1024)
min_num_cyl = 1
- max_num_cyl = Ops.get(slot, 1, 0)
+ max_num_cyl = slot[:region][1]
min_size_k = Builtins.tointeger(
Ops.divide(
@@ -214,7 +219,7 @@
#prefer max size for extended partition (#428337)
#cascaded triple operators would do, but this is more readable
- if region == slot
+ if region == slot[:region]
what = type == :extended ? :max_size : :manual_size
else
what = :manual_region
@@ -368,7 +373,7 @@
region = [s, Ops.add(Ops.subtract(e, s), 1)]
valid = Ops.greater_than(Region.Length(region), 0) &&
- Builtins.find(slots) { |slot2| Region.Inside(slot2, region)
} != nil
+ Builtins.find(slots) { |slot2| Region.Inside(slot2[:region],
region) } != nil
if !valid
# error popup
@@ -384,7 +389,7 @@
if widget == :next
case Convert.to_symbol(UI.QueryWidget(Id(:size), :Value))
when :max_size
- Ops.set(data.value, "region", slot)
+ Ops.set(data.value, "region", slot[:region])
when :manual_size
num_cyl = Builtins.tointeger(
Ops.add(
@@ -399,7 +404,7 @@
)
)
num_cyl = Integer.Clamp(num_cyl, min_num_cyl, max_num_cyl)
- Ops.set(data.value, "region", [Ops.get(slot, 0, 0), num_cyl])
+ Ops.set(data.value, "region", [Ops.get(slot[:region], 0, 0),
num_cyl])
when :manual_region
Ops.set(data.value, "region", region)
end
@@ -427,13 +432,9 @@
end
end
- Builtins.y2milestone(
- "MiniWorkflowStepPartitionSize data:%1 ret:%2",
- data.value,
- widget
- )
+ log.info("MiniWorkflowStepPartitionSize data:#{data.value}
ret:#{widget}")
- widget
+ return widget
end
@@ -501,18 +502,19 @@
start = Builtins.size(slots) == 1 ? "Size" : "Type"
if start == "Size"
- r = Storage.NextPartition(
- Ops.get_string(data.value, "disk_device", ""),
- Ops.get_symbol(data.value, "type", :none)
- )
- Ops.set(data.value, "device", Ops.get_string(r, "device", ""))
+
+ # get the largest slot of type
+ type = data.value["type"]
+ slot = data.value["slots"][type][0]
+
+ data.value["device"] = slot[:device]
if Builtins.haskey(data.value, "disk_udev_id")
Ops.set(
data.value,
"udev_id",
Builtins.maplist(Ops.get_list(data.value, "disk_udev_id", [])) do
|s|
- Builtins.sformat("%1-part%2", s, Ops.get_integer(r, "nr", 0))
+ "#{s}-part#{slot[:nr]}"
end
)
end
@@ -524,7 +526,7 @@
Builtins.sformat(
"%1-part%2",
Ops.get_string(data.value, "disk_udev_path", ""),
- Ops.get_integer(r, "nr", 0)
+ slot[:nr]
)
)
end
@@ -717,5 +719,7 @@
Builtins.sformat(_("Really delete all partitions on \"%1\"?"), disk)
)
end
+
+
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-storage-3.1.9/src/include/partitioning/ep-hd-lib.rb
new/yast2-storage-3.1.10/src/include/partitioning/ep-hd-lib.rb
--- old/yast2-storage-3.1.9/src/include/partitioning/ep-hd-lib.rb
2014-02-10 11:29:05.000000000 +0100
+++ new/yast2-storage-3.1.10/src/include/partitioning/ep-hd-lib.rb
2014-02-21 18:04:47.000000000 +0100
@@ -1,6 +1,6 @@
# encoding: utf-8
-# Copyright (c) 2012 Novell, Inc.
+# Copyright (c) [2012-2014] Novell, Inc.
#
# All Rights Reserved.
#
@@ -23,12 +23,19 @@
# Package: yast2-storage
# Summary: Expert Partitioner
# Authors: Arvin Schnell <aschn...@suse.de>
+
module Yast
module PartitioningEpHdLibInclude
+
+
+ include Yast::Logger
+
+
def initialize_partitioning_ep_hd_lib(include_target)
textdomain "storage"
end
+
def EpCreatePartitionTable(disk_device)
if disk_device == nil
# error popup
@@ -188,59 +195,34 @@
slots_ref = arg_ref(slots)
Storage.GetUnusedPartitionSlots(disk_device, slots_ref)
slots = slots_ref.value
- Builtins.y2milestone("slots %1", slots)
+
+ log.info("slots:#{slots}")
# individual sort primary, extended and logical slots
ret = {}
- tmp = []
- tmp = Builtins.filter(slots) do |slot|
- Ops.get_boolean(slot, "primary_possible", false)
- end
- tmp = Builtins.sort(tmp) do |a, b|
- Ops.greater_than(
- Ops.get_integer(a, ["region", 1], 0),
- Ops.get_integer(b, ["region", 1], 0)
- )
- end
- if Ops.greater_than(Builtins.size(tmp), 0)
- Ops.set(ret, :primary, Builtins.maplist(tmp) do |slot|
- Ops.get_list(slot, "region", [])
- end)
+ def helper(slots)
+ slots = slots.sort { |a, b| b[:region][1] <=> a[:region][1] }
+ return slots.map { |slot| slot.select { |k, v| [:region, :nr,
:device].include?(k) } }
end
- tmp = Builtins.filter(slots) do |slot|
- Ops.get_boolean(slot, "extended_possible", false)
- end
- tmp = Builtins.sort(tmp) do |a, b|
- Ops.greater_than(
- Ops.get_integer(a, ["region", 1], 0),
- Ops.get_integer(b, ["region", 1], 0)
- )
- end
- if Ops.greater_than(Builtins.size(tmp), 0)
- Ops.set(ret, :extended, Builtins.maplist(tmp) do |slot|
- Ops.get_list(slot, "region", [])
- end)
+ primary_slots = slots.select { |slot| slot.fetch(:primary_possible,
false) }
+ if !primary_slots.empty?
+ ret[:primary] = helper(primary_slots)
end
- tmp = Builtins.filter(slots) do |slot|
- Ops.get_boolean(slot, "logical_possible", false)
- end
- tmp = Builtins.sort(tmp) do |a, b|
- Ops.greater_than(
- Ops.get_integer(a, ["region", 1], 0),
- Ops.get_integer(b, ["region", 1], 0)
- )
+ extended_slots = slots.select { |slot| slot.fetch(:extended_possible,
false) }
+ if !extended_slots.empty?
+ ret[:extended] = helper(extended_slots)
end
- if Ops.greater_than(Builtins.size(tmp), 0)
- Ops.set(ret, :logical, Builtins.maplist(tmp) do |slot|
- Ops.get_list(slot, "region", [])
- end)
+
+ logical_slots = slots.select { |slot| slot.fetch(:logical_possible,
false) }
+ if !logical_slots.empty?
+ ret[:logical] = helper(logical_slots)
end
- if Builtins.size(ret) == 0
+ if ret.empty?
# error popup
Popup.Error(
Builtins.sformat(
@@ -250,7 +232,8 @@
)
end
- Builtins.y2milestone("ret %1", ret)
+ log.info("ret:#{ret}")
+
deep_copy(ret)
end
@@ -794,5 +777,7 @@
nil
end
+
+
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.1.9/src/modules/Storage.rb
new/yast2-storage-3.1.10/src/modules/Storage.rb
--- old/yast2-storage-3.1.9/src/modules/Storage.rb 2014-02-10
11:29:05.000000000 +0100
+++ new/yast2-storage-3.1.10/src/modules/Storage.rb 2014-02-21
18:04:47.000000000 +0100
@@ -19,27 +19,6 @@
# To contact Novell about this file by physical or electronic mail, you may
# find current contact information at www.novell.com.
-# Module: Storage.ycp
-#
-# Authors: Johannes Buchhold (jb...@suse.de)
-#
-# Purpose: These module contains all settings/information which
-# are needed to partitioning the harddisk. Futhermore it contains a interface
-# to * access and modify the partitioning settings.
-#
-# Todo: Translate
-# Diese Modul enthält alle Informationen die für die Partitionierung der
-# Festplatten erforderlich sind. Diese Informationen bestehen aus der
-# Beschreibung, der vor der Partitionierung vorhandenen Platteneinstellungen,
-# und der Art und Weise wie diese verändert werden soll.
-# Alle nötigen Zugriffsfunktionen auf diese Datenstruktur sind ebenfalls in
-# diesem Modul enthalten. Der Zugriff auf die Speicherung der
-# Partitionseinstellungen läuft also nur über dieses Modul.
-# Der Zugriff und die Rückgabe von Teilen der Partitionsdatenstruktur
-# wurde versucht "intelligent" zu gestallten und ist im einzelen bei den
-# entspechenden Funktionen näher erklärt.
-#
-# $Id$
require "yast"
require "dbus"
require "storage"
@@ -47,6 +26,10 @@
module Yast
class StorageClass < Module
+
+ include Yast::Logger
+
+
def main
Yast.import "Pkg"
Yast.import "UI"
@@ -338,10 +321,11 @@
def InitLibstorage(readonly)
return true if @sint != nil
- Builtins.y2milestone("InitLibstorage")
+ log.info("InitLibstorage")
+
@sint = StorageInit.CreateInterface(readonly)
if @sint == nil
- Builtins.y2error("StorageInit::CreateInterface failed")
+ log.error("StorageInit::CreateInterface failed")
return false
end
@@ -362,7 +346,8 @@
end
@conts = getContainers
- Builtins.y2milestone("InitLibstorage conts:%1", @conts)
+ log.info("InitLibstorage conts:#{@conts}")
+
FileSystems.InitSlib(@sint)
Partitions.InitSlib(@sint)
@@ -373,7 +358,7 @@
def FinishLibstorage
return if @sint == nil
- Builtins.y2milestone("FinishLibstorage")
+ log.info("FinishLibstorage")
::Storage::destroyStorageInterface(@sint)
@sint = nil
@@ -1087,13 +1072,15 @@
slots.value = []
swig_slots.each do |swig_slot|
m = {
- "region" => [ swig_slot.cylStart, swig_slot.cylSize ],
- "primary_slot" => swig_slot.primarySlot,
- "primary_possible" => swig_slot.primaryPossible,
- "extended_slot" => swig_slot.extendedSlot,
- "extended_possible" => swig_slot.extendedPossible,
- "logical_Slot" => swig_slot.logicalSlot,
- "logical_possible" => swig_slot.logicalPossible
+ :region => [ swig_slot.cylRegion.start, swig_slot.cylRegion.len ],
+ :nr => swig_slot.nr,
+ :device => swig_slot.device,
+ :primary_slot => swig_slot.primarySlot,
+ :primary_possible => swig_slot.primaryPossible,
+ :extended_slot => swig_slot.extendedSlot,
+ :extended_possible => swig_slot.extendedPossible,
+ :logical_slot => swig_slot.logicalSlot,
+ :logical_possible => swig_slot.logicalPossible
}
slots.value.push( m )
end
@@ -1439,11 +1426,7 @@
"fstype",
Partitions.FsIdToString(Ops.get_integer(p, "fsid", 0))
)
- Ops.set(
- p,
- "region",
- [ info.cylStart, info.cylSize ]
- )
+ p["region"] = [ info.cylRegion.start, info.cylRegion.len ]
Ops.set(p, "type", toSymbol(@conv_ptype, info.partitionType))
Ops.set(p, "boot", true) if info.boot
Builtins.y2milestone("partAddMap ret:%1", p)
@@ -1519,14 +1502,7 @@
"fstype",
Partitions.FsIdToString(Ops.get_integer(p, "fsid", 0))
)
- Ops.set(
- p,
- "region",
- [
- info.cylStart,
- info.cylSize
- ]
- )
+ p["region"] = [ info.cylRegion.start, info.cylRegion.len ]
t = info.partitionType
Ops.set(p, "type", toSymbol(@conv_ptype, t))
boot = info.boot
@@ -2556,44 +2532,33 @@
# @param [Symbol] mby (one of?)
# @return [Boolean] if successful
def CreatePartition(disk, device, ptype, id, start, len, mby)
- Builtins.y2milestone(
- "CreatePartition disk:%1 device:%2 ptype:%3 id:%4 start:%5 len:%6
mby:%7",
- disk,
- device,
- ptype,
- id,
- start,
- len,
- mby
- )
+ log.info("CreatePartition disk:#{disk} device:#{device} ptype:#{ptype}
id:#{id} " +
+ "start:#{start} len:#{len} mby:#{mby}")
pt = fromSymbol(@conv_ptype, ptype)
- Builtins.y2milestone("CreatePartition type:%1 pt:%2", ptype, pt)
- ret, cdev = @sint.createPartition(disk, pt, start, len)
+ log.info("CreatePartition ptype:#{ptype} pt:#{pt}")
+ region = ::Storage::RegionInfo.new(start, len)
+ ret, cdev = @sint.createPartition(disk, pt, region)
cdev = "" if ret<0
if device != cdev
- Builtins.y2error("CreatePartition device:%1 cdev:%2", device, cdev)
+ log.error("CreatePartition device:#{device} cdev:#{cdev}")
end
- Builtins.y2error("CreatePartition ret %1", ret) if ret<0
+ log.error("CreatePartition ret #{ret}") if ret<0
ret = @sint.changePartitionId(device, id)
- Builtins.y2error("CreatePartition ret %1", ret) if ret<0
+ log.error("CreatePartition ret #{ret}") if ret<0
tmp = fromSymbol(@conv_mountby, mby)
@sint.changeMountBy(device, tmp)
- Builtins.y2milestone("CreatePartition sint ret:%1", ret)
+ log.info("CreatePartition sint ret:#{ret}")
UpdateTargetMap()
ret == 0
end
def UpdatePartition(device, start, len)
- Builtins.y2milestone(
- "UpdatePartition device:%1 start:%2 len:%3",
- device,
- start,
- len
- )
- ret = @sint.updatePartitionArea(device, start, len)
+ log.info("UpdatePartition device:#{device} start:#{start} len:#{len}")
+ region = ::Storage::RegionInfo.new(start, len)
+ ret = @sint.updatePartitionArea(device, region)
if ret<0
- Builtins.y2error("UpdatePartition sint ret:%1", ret)
+ log.error("UpdatePartition sint ret:#{ret}")
end
UpdateTargetMapDev(device)
ret == 0
@@ -5220,13 +5185,10 @@
end
end
end
- Builtins.y2milestone(
- "CanEdit dev:%1 verbose:%2 ret:%3",
- Ops.get_string(p, "device", ""),
- verbose,
- ret
- )
- ret
+
+ log.info("CanEdit device:#{p["device"]} verbose:#{verbose} ret:#{ret}")
+
+ return ret
end
@@ -5324,13 +5286,9 @@
end
end
- Builtins.y2milestone(
- "CanDelete dev:%1 verbose:%2 ret:%3",
- Ops.get_string(p, "device", ""),
- verbose,
- ret
- )
- ret
+ log.info("CanDelete device:#{p["device"]} verbose:#{verbose} ret:#{ret}")
+
+ return ret
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.1.9/src/modules/StorageProposal.rb
new/yast2-storage-3.1.10/src/modules/StorageProposal.rb
--- old/yast2-storage-3.1.9/src/modules/StorageProposal.rb 2014-02-10
11:29:05.000000000 +0100
+++ new/yast2-storage-3.1.10/src/modules/StorageProposal.rb 2014-02-21
18:04:47.000000000 +0100
@@ -2512,6 +2512,7 @@
sort_map = {
"/boot" => 0,
"/boot/efi" => 0,
+ "/boot/zipl" => 0,
"swap" => 1,
"/" => 5,
"/home" => 6
@@ -3535,7 +3536,8 @@
swaps = Builtins.filter(partitions) do |p|
Ops.get_symbol(p, "type", :unknown) != :free &&
!Ops.get_boolean(p, "delete", false) &&
- Ops.get_symbol(p, "detected_fs", :unknown) == :swap
+ Ops.get_symbol(p, "detected_fs", :unknown) == :swap &&
+ [ "", "swap" ].include?(p.fetch("mount", ""))
end
swaps = Builtins.filter(swaps) do |p|
check_swapable(Ops.get_string(p, "device", ""))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.1.9/testsuite/tests/empty-s390x1.out
new/yast2-storage-3.1.10/testsuite/tests/empty-s390x1.out
--- old/yast2-storage-3.1.9/testsuite/tests/empty-s390x1.out 2014-02-10
11:29:05.000000000 +0100
+++ new/yast2-storage-3.1.10/testsuite/tests/empty-s390x1.out 2014-02-21
18:04:47.000000000 +0100
@@ -1,6 +1,6 @@
Dump Proposal:
-Dump Create swap volume /dev/sda1 (517.72 MiB)
-Dump Create volume /dev/sda2 (203.95 MiB) for /boot/zipl with ext2
+Dump Create volume /dev/sda1 (203.95 MiB) for /boot/zipl with ext2
+Dump Create swap volume /dev/sda2 (517.72 MiB)
Dump Create root volume /dev/sda3 (297.38 GiB) with btrfs
Dump Create subvolume boot/grub2/s390x on device /dev/sda3
Dump Create subvolume home on device /dev/sda3
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
