Hello community,
here is the log from the commit of package yast2-storage for openSUSE:Factory
checked in at 2014-03-01 14:38:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-26 23:20:31.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes
2014-03-01 14:38:27.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Feb 25 15:37:49 CET 2014 - aschn...@suse.de
+
+- fixed snapshots handling in proposal (bnc#865004)
+- version 3.1.11
+
+-------------------------------------------------------------------
Old:
----
yast2-storage-3.1.10.tar.bz2
New:
----
yast2-storage-3.1.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.QkNTqa/_old 2014-03-01 14:38:27.000000000 +0100
+++ /var/tmp/diff_new_pack.QkNTqa/_new 2014-03-01 14:38:27.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-storage
-Version: 3.1.10
+Version: 3.1.11
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-storage-3.1.10.tar.bz2 -> yast2-storage-3.1.11.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.1.10/package/yast2-storage.changes
new/yast2-storage-3.1.11/package/yast2-storage.changes
--- old/yast2-storage-3.1.10/package/yast2-storage.changes 2014-02-24
17:54:58.000000000 +0100
+++ new/yast2-storage-3.1.11/package/yast2-storage.changes 2014-02-28
15:20:23.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Feb 25 15:37:49 CET 2014 - aschn...@suse.de
+
+- fixed snapshots handling in proposal (bnc#865004)
+- version 3.1.11
+
+-------------------------------------------------------------------
Mon Feb 24 16:15:28 CET 2014 - aschn...@suse.de
- disallow to create and delete partitions on ECKD DASDs if other
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.1.10/package/yast2-storage.spec
new/yast2-storage-3.1.11/package/yast2-storage.spec
--- old/yast2-storage-3.1.10/package/yast2-storage.spec 2014-02-24
17:54:58.000000000 +0100
+++ new/yast2-storage-3.1.11/package/yast2-storage.spec 2014-02-28
15:20:23.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-storage
-Version: 3.1.10
+Version: 3.1.11
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-storage-3.1.10/src/include/partitioning/ep-btrfs-dialogs.rb
new/yast2-storage-3.1.11/src/include/partitioning/ep-btrfs-dialogs.rb
--- old/yast2-storage-3.1.10/src/include/partitioning/ep-btrfs-dialogs.rb
2014-02-24 17:54:58.000000000 +0100
+++ new/yast2-storage-3.1.11/src/include/partitioning/ep-btrfs-dialogs.rb
2014-02-28 15:20:23.000000000 +0100
@@ -33,7 +33,8 @@
Builtins.y2milestone("DlgEditBtrfsVolume %1", data.value)
device = Ops.get_string(data.value, "device", "error")
- aliases = { "FormatMount" => lambda do
+ aliases = {
+ "FormatMount" => lambda do
(
data_ref = arg_ref(data.value);
_MiniWorkflowStepFormatMount_result = MiniWorkflowStepFormatMount(
@@ -42,15 +43,16 @@
data.value = data_ref.value;
_MiniWorkflowStepFormatMount_result
)
- end, "Password" => lambda(
- ) do
+ end,
+ "Password" => lambda do
(
data_ref = arg_ref(data.value);
_MiniWorkflowStepPassword_result =
MiniWorkflowStepPassword(data_ref);
data.value = data_ref.value;
_MiniWorkflowStepPassword_result
)
- end }
+ end
+ }
sequence = {
"FormatMount" => { :next => "Password", :finish => :finish },
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-storage-3.1.10/src/include/partitioning/ep-dm-dialogs.rb
new/yast2-storage-3.1.11/src/include/partitioning/ep-dm-dialogs.rb
--- old/yast2-storage-3.1.10/src/include/partitioning/ep-dm-dialogs.rb
2014-02-24 17:54:58.000000000 +0100
+++ new/yast2-storage-3.1.11/src/include/partitioning/ep-dm-dialogs.rb
2014-02-28 15:20:23.000000000 +0100
@@ -32,7 +32,8 @@
def DlgEditDmVolume(data)
device = Ops.get_string(data.value, "device", "error")
- aliases = { "FormatMount" => lambda do
+ aliases = {
+ "FormatMount" => lambda do
(
data_ref = arg_ref(data.value);
_MiniWorkflowStepFormatMount_result = MiniWorkflowStepFormatMount(
@@ -41,15 +42,16 @@
data.value = data_ref.value;
_MiniWorkflowStepFormatMount_result
)
- end, "Password" => lambda(
- ) do
+ end,
+ "Password" => lambda do
(
data_ref = arg_ref(data.value);
_MiniWorkflowStepPassword_result =
MiniWorkflowStepPassword(data_ref);
data.value = data_ref.value;
_MiniWorkflowStepPassword_result
)
- end }
+ end
+ }
sequence = {
"FormatMount" => { :next => "Password", :finish => :finish },
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-storage-3.1.10/src/include/partitioning/ep-hd-dialogs.rb
new/yast2-storage-3.1.11/src/include/partitioning/ep-hd-dialogs.rb
--- old/yast2-storage-3.1.10/src/include/partitioning/ep-hd-dialogs.rb
2014-02-24 17:54:58.000000000 +0100
+++ new/yast2-storage-3.1.11/src/include/partitioning/ep-hd-dialogs.rb
2014-02-28 15:20:23.000000000 +0100
@@ -553,7 +553,8 @@
def DlgEditPartition(data)
device = Ops.get_string(data.value, "device", "error")
- aliases = { "FormatMount" => lambda do
+ aliases = {
+ "FormatMount" => lambda do
(
data_ref = arg_ref(data.value);
_MiniWorkflowStepFormatMount_result = MiniWorkflowStepFormatMount(
@@ -562,15 +563,16 @@
data.value = data_ref.value;
_MiniWorkflowStepFormatMount_result
)
- end, "Password" => lambda(
- ) do
+ end,
+ "Password" => lambda do
(
data_ref = arg_ref(data.value);
_MiniWorkflowStepPassword_result =
MiniWorkflowStepPassword(data_ref);
data.value = data_ref.value;
_MiniWorkflowStepPassword_result
)
- end }
+ end
+ }
sequence = {
"FormatMount" => { :next => "Password", :finish => :finish },
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-storage-3.1.10/src/include/partitioning/ep-loop-dialogs.rb
new/yast2-storage-3.1.11/src/include/partitioning/ep-loop-dialogs.rb
--- old/yast2-storage-3.1.10/src/include/partitioning/ep-loop-dialogs.rb
2014-02-24 17:54:58.000000000 +0100
+++ new/yast2-storage-3.1.11/src/include/partitioning/ep-loop-dialogs.rb
2014-02-28 15:20:23.000000000 +0100
@@ -295,7 +295,8 @@
def DlgEditLoop(data)
device = Ops.get_string(data.value, "device", "error")
- aliases = { "FormatMount" => lambda do
+ aliases = {
+ "FormatMount" => lambda do
(
data_ref = arg_ref(data.value);
_MiniWorkflowStepFormatMount_result = MiniWorkflowStepFormatMount(
@@ -304,15 +305,16 @@
data.value = data_ref.value;
_MiniWorkflowStepFormatMount_result
)
- end, "Password" => lambda(
- ) do
+ end,
+ "Password" => lambda do
(
data_ref = arg_ref(data.value);
_MiniWorkflowStepPassword_result =
MiniWorkflowStepPassword(data_ref);
data.value = data_ref.value;
_MiniWorkflowStepPassword_result
)
- end }
+ end
+ }
sequence = {
"FormatMount" => { :next => "Password", :finish => :finish },
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-storage-3.1.10/src/include/partitioning/ep-lvm-dialogs.rb
new/yast2-storage-3.1.11/src/include/partitioning/ep-lvm-dialogs.rb
--- old/yast2-storage-3.1.10/src/include/partitioning/ep-lvm-dialogs.rb
2014-02-24 17:54:58.000000000 +0100
+++ new/yast2-storage-3.1.11/src/include/partitioning/ep-lvm-dialogs.rb
2014-02-28 15:20:23.000000000 +0100
@@ -458,14 +458,16 @@
def DlgCreateVolumeGroupNew(data)
- aliases = { "TheOne" => lambda do
+ aliases = {
+ "TheOne" => lambda do
(
data_ref = arg_ref(data.value);
_MiniWorkflowStepVg_result = MiniWorkflowStepVg(data_ref);
data.value = data_ref.value;
_MiniWorkflowStepVg_result
)
- end }
+ end
+ }
sequence = { "TheOne" => { :finish => :finish } }
@@ -1031,7 +1033,8 @@
def DlgEditLogicalVolume(data)
device = Ops.get_string(data.value, "device", "error")
- aliases = { "FormatMount" => lambda do
+ aliases = {
+ "FormatMount" => lambda do
(
data_ref = arg_ref(data.value);
_MiniWorkflowStepFormatMount_result = MiniWorkflowStepFormatMount(
@@ -1040,15 +1043,16 @@
data.value = data_ref.value;
_MiniWorkflowStepFormatMount_result
)
- end, "Password" => lambda(
- ) do
+ end,
+ "Password" => lambda do
(
data_ref = arg_ref(data.value);
_MiniWorkflowStepPassword_result =
MiniWorkflowStepPassword(data_ref);
data.value = data_ref.value;
_MiniWorkflowStepPassword_result
)
- end }
+ end
+ }
sequence = {
"FormatMount" => { :next => "Password", :finish => :finish },
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-storage-3.1.10/src/include/partitioning/ep-raid-dialogs.rb
new/yast2-storage-3.1.11/src/include/partitioning/ep-raid-dialogs.rb
--- old/yast2-storage-3.1.10/src/include/partitioning/ep-raid-dialogs.rb
2014-02-24 17:54:58.000000000 +0100
+++ new/yast2-storage-3.1.11/src/include/partitioning/ep-raid-dialogs.rb
2014-02-28 15:20:23.000000000 +0100
@@ -645,7 +645,8 @@
def DlgResizeRaid(data)
- aliases = { "TheOne" => lambda do
+ aliases = {
+ "TheOne" => lambda do
(
data_ref = arg_ref(data.value);
_MiniWorkflowStepResizeRaid_result = MiniWorkflowStepResizeRaid(
@@ -654,7 +655,8 @@
data.value = data_ref.value;
_MiniWorkflowStepResizeRaid_result
)
- end }
+ end
+ }
sequence = { "TheOne" => { :finish => :finish } }
@@ -679,7 +681,8 @@
def DlgEditRaid(data)
device = Ops.get_string(data.value, "device", "error")
- aliases = { "FormatMount" => lambda do
+ aliases = {
+ "FormatMount" => lambda do
(
data_ref = arg_ref(data.value);
_MiniWorkflowStepFormatMount_result = MiniWorkflowStepFormatMount(
@@ -688,15 +691,16 @@
data.value = data_ref.value;
_MiniWorkflowStepFormatMount_result
)
- end, "Password" => lambda(
- ) do
+ end,
+ "Password" => lambda do
(
data_ref = arg_ref(data.value);
_MiniWorkflowStepPassword_result =
MiniWorkflowStepPassword(data_ref);
data.value = data_ref.value;
_MiniWorkflowStepPassword_result
)
- end }
+ end
+ }
sequence = {
"FormatMount" => { :next => "Password", :finish => :finish },
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-storage-3.1.10/src/include/partitioning/ep-tmpfs-dialogs.rb
new/yast2-storage-3.1.11/src/include/partitioning/ep-tmpfs-dialogs.rb
--- old/yast2-storage-3.1.10/src/include/partitioning/ep-tmpfs-dialogs.rb
2014-02-24 17:54:58.000000000 +0100
+++ new/yast2-storage-3.1.11/src/include/partitioning/ep-tmpfs-dialogs.rb
2014-02-28 15:20:23.000000000 +0100
@@ -30,7 +30,8 @@
end
def DlgCreateTmpfs(data)
- aliases = { "FormatMount" => lambda do
+ aliases = {
+ "FormatMount" => lambda do
(
data_ref = arg_ref(data.value);
_MiniWorkflowStepFormatMount_result = MiniWorkflowStepFormatMount(
@@ -39,7 +40,8 @@
data.value = data_ref.value;
_MiniWorkflowStepFormatMount_result
)
- end }
+ end
+ }
sequence = { "FormatMount" => { :finish => :finish } }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.1.10/src/modules/StorageProposal.rb
new/yast2-storage-3.1.11/src/modules/StorageProposal.rb
--- old/yast2-storage-3.1.10/src/modules/StorageProposal.rb 2014-02-24
17:54:58.000000000 +0100
+++ new/yast2-storage-3.1.11/src/modules/StorageProposal.rb 2014-02-28
15:20:23.000000000 +0100
@@ -4040,6 +4040,7 @@
if Ops.get_boolean(ps1, "ok", false)
ret = Ops.get_list(ps1, ["disk", "partitions"], [])
end
+ ret = post_process_partitions(ret)
Builtins.y2milestone("get_proposal ret:%1", ret)
deep_copy(ret)
end
@@ -4393,31 +4394,40 @@
end
- def post_process_target(target)
+ def post_process_partitions(partitions)
- target.each do |device, container|
- container["partitions"].each do |volume|
+ partitions.each do |volume|
- # if we have a home volume remove the home subvolume
- if PropDefaultFs() == :btrfs && GetProposalHome()
- if volume["mount"] == "/"
- if FileSystems.default_subvol.empty?
- home = "home"
- else
- home = FileSystems.default_subvol + "/" + "home"
- end
- volume["subvol"].delete_if { |subvol| subvol["name"] == home }
+ # if we have a home volume remove the home subvolume
+ if PropDefaultFs() == :btrfs && GetProposalHome()
+ if volume["mount"] == "/"
+ if FileSystems.default_subvol.empty?
+ home = "home"
+ else
+ home = FileSystems.default_subvol + "/" + "home"
end
+ volume["subvol"].delete_if { |subvol| subvol["name"] == home }
end
+ end
- # enable snapshots for root volume if desired
- if PropDefaultFs() == :btrfs && GetProposalSnapshots()
- if volume["mount"] == "/"
- volume["userdata"] = { "/" => "snapshots" }
- end
+ # enable snapshots for root volume if desired
+ if PropDefaultFs() == :btrfs && GetProposalSnapshots()
+ if volume["mount"] == "/"
+ volume["userdata"] = { "/" => "snapshots" }
end
-
end
+
+ end
+
+ return partitions
+
+ end
+
+
+ def post_process_target(target)
+
+ target.each do |device, container|
+ container["partitions"] =
post_process_partitions(container["partitions"])
end
return target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.1.10/testsuite/tests/empty-efi1.out
new/yast2-storage-3.1.11/testsuite/tests/empty-efi1.out
--- old/yast2-storage-3.1.10/testsuite/tests/empty-efi1.out 2014-02-24
17:54:58.000000000 +0100
+++ new/yast2-storage-3.1.11/testsuite/tests/empty-efi1.out 2014-02-28
15:20:23.000000000 +0100
@@ -14,3 +14,5 @@
Dump Create subvolume var/opt on device /dev/sda3
Dump Create subvolume var/spool on device /dev/sda3
Dump Create subvolume var/tmp on device /dev/sda3
+Dump
+Dump Extra Data:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.1.10/testsuite/tests/empty-efi2.out
new/yast2-storage-3.1.11/testsuite/tests/empty-efi2.out
--- old/yast2-storage-3.1.10/testsuite/tests/empty-efi2.out 2014-02-24
17:54:58.000000000 +0100
+++ new/yast2-storage-3.1.11/testsuite/tests/empty-efi2.out 2014-02-28
15:20:23.000000000 +0100
@@ -14,3 +14,5 @@
Dump Create subvolume var/opt on device /dev/sda3
Dump Create subvolume var/spool on device /dev/sda3
Dump Create subvolume var/tmp on device /dev/sda3
+Dump
+Dump Extra Data:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-storage-3.1.10/testsuite/tests/empty-s390x1.out
new/yast2-storage-3.1.11/testsuite/tests/empty-s390x1.out
--- old/yast2-storage-3.1.10/testsuite/tests/empty-s390x1.out 2014-02-24
17:54:58.000000000 +0100
+++ new/yast2-storage-3.1.11/testsuite/tests/empty-s390x1.out 2014-02-28
15:20:23.000000000 +0100
@@ -13,3 +13,6 @@
Dump Create subvolume var/opt on device /dev/sda3
Dump Create subvolume var/spool on device /dev/sda3
Dump Create subvolume var/tmp on device /dev/sda3
+Dump
+Dump Extra Data:
+Dump device:/dev/sda3 userdata:{"/"=>"snapshots"}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.1.10/testsuite/tests/empty-s390x1.rb
new/yast2-storage-3.1.11/testsuite/tests/empty-s390x1.rb
--- old/yast2-storage-3.1.10/testsuite/tests/empty-s390x1.rb 2014-02-24
17:54:58.000000000 +0100
+++ new/yast2-storage-3.1.11/testsuite/tests/empty-s390x1.rb 2014-02-28
15:20:23.000000000 +0100
@@ -17,6 +17,7 @@
ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false)
ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30
GB")
ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20
GB")
+ ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots",
true)
Yast.include self, "helper1b.rb"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.1.10/testsuite/tests/empty1.out
new/yast2-storage-3.1.11/testsuite/tests/empty1.out
--- old/yast2-storage-3.1.10/testsuite/tests/empty1.out 2014-02-24
17:54:58.000000000 +0100
+++ new/yast2-storage-3.1.11/testsuite/tests/empty1.out 2014-02-28
15:20:23.000000000 +0100
@@ -12,3 +12,5 @@
Dump Create subvolume var/opt on device /dev/sda2
Dump Create subvolume var/spool on device /dev/sda2
Dump Create subvolume var/tmp on device /dev/sda2
+Dump
+Dump Extra Data:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.1.10/testsuite/tests/empty2.out
new/yast2-storage-3.1.11/testsuite/tests/empty2.out
--- old/yast2-storage-3.1.10/testsuite/tests/empty2.out 2014-02-24
17:54:58.000000000 +0100
+++ new/yast2-storage-3.1.11/testsuite/tests/empty2.out 2014-02-28
15:20:23.000000000 +0100
@@ -1,7 +1,7 @@
Dump Proposal:
Dump Create swap volume /dev/sda1 (2.01 GiB)
-Dump Create root volume /dev/sda2 (20.00 GiB) with btrfs
-Dump Create volume /dev/sda3 (276.08 GiB) for /home with xfs
+Dump Create root volume /dev/sda2 (40.00 GiB) with btrfs
+Dump Create volume /dev/sda3 (256.08 GiB) for /home with xfs
Dump Create subvolume boot/grub2/i386-pc on device /dev/sda2
Dump Create subvolume opt on device /dev/sda2
Dump Create subvolume srv on device /dev/sda2
@@ -12,3 +12,6 @@
Dump Create subvolume var/opt on device /dev/sda2
Dump Create subvolume var/spool on device /dev/sda2
Dump Create subvolume var/tmp on device /dev/sda2
+Dump
+Dump Extra Data:
+Dump device:/dev/sda2 userdata:{"/"=>"snapshots"}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.1.10/testsuite/tests/empty2.rb
new/yast2-storage-3.1.11/testsuite/tests/empty2.rb
--- old/yast2-storage-3.1.10/testsuite/tests/empty2.rb 2014-02-24
17:54:58.000000000 +0100
+++ new/yast2-storage-3.1.11/testsuite/tests/empty2.rb 2014-02-28
15:20:23.000000000 +0100
@@ -14,7 +14,7 @@
ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home",
true)
ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false)
- ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots",
false)
+ ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots",
true)
ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30
GB")
ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20
GB")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.1.10/testsuite/tests/empty3.out
new/yast2-storage-3.1.11/testsuite/tests/empty3.out
--- old/yast2-storage-3.1.10/testsuite/tests/empty3.out 2014-02-24
17:54:58.000000000 +0100
+++ new/yast2-storage-3.1.11/testsuite/tests/empty3.out 2014-02-28
15:20:23.000000000 +0100
@@ -15,3 +15,5 @@
Dump Create subvolume var/opt on device /dev/system/root
Dump Create subvolume var/spool on device /dev/system/root
Dump Create subvolume var/tmp on device /dev/system/root
+Dump
+Dump Extra Data:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.1.10/testsuite/tests/empty4.out
new/yast2-storage-3.1.11/testsuite/tests/empty4.out
--- old/yast2-storage-3.1.10/testsuite/tests/empty4.out 2014-02-24
17:54:58.000000000 +0100
+++ new/yast2-storage-3.1.11/testsuite/tests/empty4.out 2014-02-28
15:20:23.000000000 +0100
@@ -16,3 +16,5 @@
Dump Create subvolume var/opt on device /dev/system/root
Dump Create subvolume var/spool on device /dev/system/root
Dump Create subvolume var/tmp on device /dev/system/root
+Dump
+Dump Extra Data:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.1.10/testsuite/tests/empty5.out
new/yast2-storage-3.1.11/testsuite/tests/empty5.out
--- old/yast2-storage-3.1.10/testsuite/tests/empty5.out 2014-02-24
17:54:58.000000000 +0100
+++ new/yast2-storage-3.1.11/testsuite/tests/empty5.out 2014-02-28
15:20:23.000000000 +0100
@@ -15,3 +15,5 @@
Dump Create subvolume var/opt on device /dev/system/root
Dump Create subvolume var/spool on device /dev/system/root
Dump Create subvolume var/tmp on device /dev/system/root
+Dump
+Dump Extra Data:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.1.10/testsuite/tests/empty6.out
new/yast2-storage-3.1.11/testsuite/tests/empty6.out
--- old/yast2-storage-3.1.10/testsuite/tests/empty6.out 2014-02-24
17:54:58.000000000 +0100
+++ new/yast2-storage-3.1.11/testsuite/tests/empty6.out 2014-02-28
15:20:23.000000000 +0100
@@ -16,3 +16,5 @@
Dump Create subvolume var/opt on device /dev/system/root
Dump Create subvolume var/spool on device /dev/system/root
Dump Create subvolume var/tmp on device /dev/system/root
+Dump
+Dump Extra Data:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.1.10/testsuite/tests/empty7.out
new/yast2-storage-3.1.11/testsuite/tests/empty7.out
--- old/yast2-storage-3.1.10/testsuite/tests/empty7.out 2014-02-24
17:54:58.000000000 +0100
+++ new/yast2-storage-3.1.11/testsuite/tests/empty7.out 2014-02-28
15:20:23.000000000 +0100
@@ -12,3 +12,6 @@
Dump Create subvolume var/opt on device /dev/sda2
Dump Create subvolume var/spool on device /dev/sda2
Dump Create subvolume var/tmp on device /dev/sda2
+Dump
+Dump Extra Data:
+Dump device:/dev/sda2 userdata:{"/"=>"snapshots"}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.1.10/testsuite/tests/half-empty1.out
new/yast2-storage-3.1.11/testsuite/tests/half-empty1.out
--- old/yast2-storage-3.1.10/testsuite/tests/half-empty1.out 2014-02-24
17:54:58.000000000 +0100
+++ new/yast2-storage-3.1.11/testsuite/tests/half-empty1.out 2014-02-28
15:20:23.000000000 +0100
@@ -13,3 +13,5 @@
Dump Create subvolume var/opt on device /dev/sda6
Dump Create subvolume var/spool on device /dev/sda6
Dump Create subvolume var/tmp on device /dev/sda6
+Dump
+Dump Extra Data:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.1.10/testsuite/tests/helper1b.rb
new/yast2-storage-3.1.11/testsuite/tests/helper1b.rb
--- old/yast2-storage-3.1.10/testsuite/tests/helper1b.rb 2014-02-24
17:54:58.000000000 +0100
+++ new/yast2-storage-3.1.11/testsuite/tests/helper1b.rb 2014-02-28
15:20:23.000000000 +0100
@@ -12,22 +12,34 @@
StorageProposal.GetControlCfg
- @target_map = Storage.GetTargetMap
- @prop = StorageProposal.get_inst_prop(@target_map)
+ target_map = Storage.GetTargetMap()
+ prop = StorageProposal.get_inst_prop(target_map)
- if Ops.get_boolean(@prop, "ok", false)
- Storage.SetTargetMap(Ops.get_map(@prop, "target", {}))
+ if prop.fetch("ok", false)
+ Storage.SetTargetMap(prop.fetch("target", {}))
- @infos = Storage.GetCommitInfos
+ infos = Storage.GetCommitInfos
Testsuite.Dump("Proposal:")
- Builtins.foreach(@infos) do |info|
- text = Ops.get_string(info, :text, "")
- if Ops.get_boolean(info, :destructive, false)
- text = Ops.add(text, " [destructive]")
+ infos.each do |info|
+ text = info.fetch(:text, "")
+ if info.fetch(:destructive, false)
+ text += " [destructive]"
end
Testsuite.Dump(text)
end
+
+ Testsuite.Dump("")
+
+ Testsuite.Dump("Extra Data:")
+ prop["target"].each do |device, container|
+ container["partitions"].each do |volume|
+ if !volume.fetch("userdata", {}).empty?
+ Testsuite.Dump("device:#{volume["device"]}
userdata:#{volume["userdata"]}")
+ end
+ end
+ end
+
else
Testsuite.Dump("No proposal.")
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.1.10/testsuite/tests/reuse-home1.out
new/yast2-storage-3.1.11/testsuite/tests/reuse-home1.out
--- old/yast2-storage-3.1.10/testsuite/tests/reuse-home1.out 2014-02-24
17:54:58.000000000 +0100
+++ new/yast2-storage-3.1.11/testsuite/tests/reuse-home1.out 2014-02-28
15:20:23.000000000 +0100
@@ -12,3 +12,5 @@
Dump Create subvolume var/tmp on device /dev/sda2
Dump Use /dev/sda1 as swap
Dump Set mount point of /dev/sda3 to /home
+Dump
+Dump Extra Data:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-storage-3.1.10/testsuite/tests/windows-only-efi1.out
new/yast2-storage-3.1.11/testsuite/tests/windows-only-efi1.out
--- old/yast2-storage-3.1.10/testsuite/tests/windows-only-efi1.out
2014-02-24 17:54:58.000000000 +0100
+++ new/yast2-storage-3.1.11/testsuite/tests/windows-only-efi1.out
2014-02-28 15:20:23.000000000 +0100
@@ -14,3 +14,5 @@
Dump Create subvolume var/spool on device /dev/sda4
Dump Create subvolume var/tmp on device /dev/sda4
Dump Set mount point of /dev/sda1 to /boot/efi
+Dump
+Dump Extra Data:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-storage-3.1.10/testsuite/tests/windows-only-efi1.rb
new/yast2-storage-3.1.11/testsuite/tests/windows-only-efi1.rb
--- old/yast2-storage-3.1.10/testsuite/tests/windows-only-efi1.rb
2014-02-24 17:54:58.000000000 +0100
+++ new/yast2-storage-3.1.11/testsuite/tests/windows-only-efi1.rb
2014-02-28 15:20:23.000000000 +0100
@@ -16,6 +16,7 @@
ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false)
ProductFeatures.SetStringFeature("partitioning", "root_max_size", "20
GB")
ProductFeatures.SetStringFeature("partitioning", "root_base_size", "15
GB")
+ ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots",
false)
Yast.include self, "helper1b.rb"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-storage-3.1.10/testsuite/tests/windows-only1.out
new/yast2-storage-3.1.11/testsuite/tests/windows-only1.out
--- old/yast2-storage-3.1.10/testsuite/tests/windows-only1.out 2014-02-24
17:54:58.000000000 +0100
+++ new/yast2-storage-3.1.11/testsuite/tests/windows-only1.out 2014-02-28
15:20:23.000000000 +0100
@@ -14,3 +14,5 @@
Dump Create subvolume var/opt on device /dev/sda6
Dump Create subvolume var/spool on device /dev/sda6
Dump Create subvolume var/tmp on device /dev/sda6
+Dump
+Dump Extra Data:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.1.10/testsuite/tests/windows1.out
new/yast2-storage-3.1.11/testsuite/tests/windows1.out
--- old/yast2-storage-3.1.10/testsuite/tests/windows1.out 2014-02-24
17:54:58.000000000 +0100
+++ new/yast2-storage-3.1.11/testsuite/tests/windows1.out 2014-02-28
15:20:23.000000000 +0100
@@ -13,3 +13,5 @@
Dump Create subvolume var/opt on device /dev/sda6
Dump Create subvolume var/spool on device /dev/sda6
Dump Create subvolume var/tmp on device /dev/sda6
+Dump
+Dump Extra Data:
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
