Hello community,
here is the log from the commit of package yast2-storage-ng for
openSUSE:Factory checked in at 2020-12-12 20:27:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-storage-ng (Old)
and /work/SRC/openSUSE:Factory/.yast2-storage-ng.new.2328 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-storage-ng"
Sat Dec 12 20:27:18 2020 rev:94 rq:854492 version:4.3.28
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-storage-ng/yast2-storage-ng.changes
2020-12-05 20:35:48.678625277 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-storage-ng.new.2328/yast2-storage-ng.changes
2020-12-12 20:27:22.533540414 +0100
@@ -1,0 +2,7 @@
+Thu Dec 10 08:45:09 UTC 2020 - José Iván López González <[email protected]>
+
+- Partitioner: do not show summary when there are no actions to
+ perform (bsc#1179829).
+- 4.3.28
+
+-------------------------------------------------------------------
Old:
----
yast2-storage-ng-4.3.27.tar.bz2
New:
----
yast2-storage-ng-4.3.28.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage-ng.spec ++++++
--- /var/tmp/diff_new_pack.N8tmBD/_old 2020-12-12 20:27:22.993540892 +0100
+++ /var/tmp/diff_new_pack.N8tmBD/_new 2020-12-12 20:27:22.993540892 +0100
@@ -17,7 +17,7 @@
Name: yast2-storage-ng
-Version: 4.3.27
+Version: 4.3.28
Release: 0
Summary: YaST2 - Storage Configuration
License: GPL-2.0-only OR GPL-3.0-only
++++++ yast2-storage-ng-4.3.27.tar.bz2 -> yast2-storage-ng-4.3.28.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-storage-ng-4.3.27/package/yast2-storage-ng.changes
new/yast2-storage-ng-4.3.28/package/yast2-storage-ng.changes
--- old/yast2-storage-ng-4.3.27/package/yast2-storage-ng.changes
2020-12-04 13:27:17.000000000 +0100
+++ new/yast2-storage-ng-4.3.28/package/yast2-storage-ng.changes
2020-12-10 10:12:46.000000000 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Thu Dec 10 08:45:09 UTC 2020 - José Iván López González <[email protected]>
+
+- Partitioner: do not show summary when there are no actions to
+ perform (bsc#1179829).
+- 4.3.28
+
+-------------------------------------------------------------------
Fri Dec 4 08:57:17 UTC 2020 - José Iván López González <[email protected]>
- Fix unit tests (related to jsc#SLE-11308).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-storage-ng-4.3.27/package/yast2-storage-ng.spec
new/yast2-storage-ng-4.3.28/package/yast2-storage-ng.spec
--- old/yast2-storage-ng-4.3.27/package/yast2-storage-ng.spec 2020-12-04
13:27:17.000000000 +0100
+++ new/yast2-storage-ng-4.3.28/package/yast2-storage-ng.spec 2020-12-10
10:12:46.000000000 +0100
@@ -16,7 +16,7 @@
#
Name: yast2-storage-ng
-Version: 4.3.27
+Version: 4.3.28
Release: 0
Summary: YaST2 - Storage Configuration
License: GPL-2.0-only OR GPL-3.0-only
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-storage-ng-4.3.27/src/lib/y2partitioner/actions/quit_partitioner.rb
new/yast2-storage-ng-4.3.28/src/lib/y2partitioner/actions/quit_partitioner.rb
---
old/yast2-storage-ng-4.3.27/src/lib/y2partitioner/actions/quit_partitioner.rb
2020-12-04 13:27:17.000000000 +0100
+++
new/yast2-storage-ng-4.3.28/src/lib/y2partitioner/actions/quit_partitioner.rb
2020-12-10 10:12:46.000000000 +0100
@@ -1,4 +1,4 @@
-# Copyright (c) [2018] SUSE LLC
+# Copyright (c) [2018-2020] SUSE LLC
#
# All Rights Reserved.
#
@@ -65,7 +65,7 @@
#
# @return [Boolean]
def system_edited?
- DeviceGraphs.instance.devices_edited?
+ DeviceGraphs.instance.actions?
end
# Confirmation popup before quitting the Expert Partitioner
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-storage-ng-4.3.27/src/lib/y2partitioner/device_graphs.rb
new/yast2-storage-ng-4.3.28/src/lib/y2partitioner/device_graphs.rb
--- old/yast2-storage-ng-4.3.27/src/lib/y2partitioner/device_graphs.rb
2020-12-04 13:27:17.000000000 +0100
+++ new/yast2-storage-ng-4.3.28/src/lib/y2partitioner/device_graphs.rb
2020-12-10 10:12:46.000000000 +0100
@@ -142,11 +142,11 @@
@checkpoints[device.sid]
end
- # Whether initial devices have been modified
+ # Whether there are actions to perform during the commit phase
#
# @return [Boolean]
- def devices_edited?
- current != initial
+ def actions?
+ !current.actiongraph.empty?
end
private
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-storage-ng-4.3.27/src/lib/y2partitioner/dialogs/main.rb
new/yast2-storage-ng-4.3.28/src/lib/y2partitioner/dialogs/main.rb
--- old/yast2-storage-ng-4.3.27/src/lib/y2partitioner/dialogs/main.rb
2020-12-04 13:27:17.000000000 +0100
+++ new/yast2-storage-ng-4.3.28/src/lib/y2partitioner/dialogs/main.rb
2020-12-10 10:12:46.000000000 +0100
@@ -175,7 +175,7 @@
#
# @return [Boolean]
def system_edited?
- DeviceGraphs.instance.devices_edited?
+ DeviceGraphs.instance.actions?
end
# Current devicegraph with all the modifications
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-storage-ng-4.3.27/test/y2partitioner/actions/quit_partitioner_test.rb
new/yast2-storage-ng-4.3.28/test/y2partitioner/actions/quit_partitioner_test.rb
---
old/yast2-storage-ng-4.3.27/test/y2partitioner/actions/quit_partitioner_test.rb
2020-12-04 13:27:17.000000000 +0100
+++
new/yast2-storage-ng-4.3.28/test/y2partitioner/actions/quit_partitioner_test.rb
2020-12-10 10:12:46.000000000 +0100
@@ -1,5 +1,6 @@
#!/usr/bin/env rspec
-# Copyright (c) [2018] SUSE LLC
+
+# Copyright (c) [2018-2020] SUSE LLC
#
# All Rights Reserved.
#
@@ -27,18 +28,18 @@
devicegraph_stub("mixed_disks")
devicegraphs = Y2Partitioner::DeviceGraphs.instance
- allow(devicegraphs).to receive(:devices_edited?).and_return(devices_edited)
+ allow(devicegraphs).to receive(:actions?).and_return(actions)
allow(Y2Partitioner::DeviceGraphs).to
receive(:instance).and_return(devicegraphs)
end
- let(:devices_edited) { false }
+ let(:actions) { false }
subject { described_class.new }
describe "#run" do
context "when no devices have been modified" do
- let(:devices_edited) { false }
+ let(:actions) { false }
it "does not show a confirmation popup" do
expect(Yast2::Popup).to_not receive(:show)
@@ -52,7 +53,7 @@
end
context "when some devices have been modified" do
- let(:devices_edited) { true }
+ let(:actions) { true }
before do
allow(Yast2::Popup).to receive(:show).and_return(accept)
@@ -86,7 +87,7 @@
describe "#quit?" do
context "when no devices have been modified" do
- let(:devices_edited) { false }
+ let(:actions) { false }
it "returns true" do
expect(subject.quit?).to eq(true)
@@ -94,7 +95,7 @@
end
context "when some devices have been modified" do
- let(:devices_edited) { true }
+ let(:actions) { true }
before do
allow(Yast2::Popup).to receive(:show).and_return(accept)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-storage-ng-4.3.27/test/y2partitioner/device_graphs_test.rb
new/yast2-storage-ng-4.3.28/test/y2partitioner/device_graphs_test.rb
--- old/yast2-storage-ng-4.3.27/test/y2partitioner/device_graphs_test.rb
2020-12-04 13:27:17.000000000 +0100
+++ new/yast2-storage-ng-4.3.28/test/y2partitioner/device_graphs_test.rb
2020-12-10 10:12:46.000000000 +0100
@@ -69,21 +69,28 @@
end
end
- describe "#devices_edited?" do
- context "when no devices have been modified in the current graph" do
+ describe "#actions?" do
+ context "when there are no actions to perform in the current graph" do
+ before do
+ # Note that adding userdata makes devicegraphs to be not equal when
comparing them.
+ # Regression for bsc#1179829.
+ sdb2 = subject.current.find_by_name("/dev/sdb2")
+ sdb2.filesystem.subvolumes_prefix = "@"
+ end
+
it "returns false" do
- expect(subject.devices_edited?).to eq(false)
+ expect(subject.actions?).to eq(false)
end
end
- context "when some devices have been modified in the current graph" do
+ context "when there are actions to perform in the current graph" do
before do
sda2 = subject.current.find_by_name("/dev/sda2")
sda2.delete_filesystem
end
it "returns true" do
- expect(subject.devices_edited?).to eq(true)
+ expect(subject.actions?).to eq(true)
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-storage-ng-4.3.27/test/y2partitioner/dialogs/main_test.rb
new/yast2-storage-ng-4.3.28/test/y2partitioner/dialogs/main_test.rb
--- old/yast2-storage-ng-4.3.27/test/y2partitioner/dialogs/main_test.rb
2020-12-04 13:27:17.000000000 +0100
+++ new/yast2-storage-ng-4.3.28/test/y2partitioner/dialogs/main_test.rb
2020-12-10 10:12:46.000000000 +0100
@@ -1,5 +1,6 @@
#!/usr/bin/env rspec
-# Copyright (c) [2018] SUSE LLC
+
+# Copyright (c) [2018-2020] SUSE LLC
#
# All Rights Reserved.
#
@@ -30,14 +31,14 @@
allow(Yast::Mode).to receive(:installation).and_return(installation)
devicegraphs = Y2Partitioner::DeviceGraphs.instance
- allow(devicegraphs).to receive(:devices_edited?).and_return(devices_edited)
+ allow(devicegraphs).to receive(:actions?).and_return(actions)
allow(Y2Partitioner::DeviceGraphs).to
receive(:instance).and_return(devicegraphs)
end
let(:installation) { true }
- let(:devices_edited) { false }
+ let(:actions) { false }
let(:system_graph) { Y2Partitioner::DeviceGraphs.instance.system }
@@ -91,7 +92,7 @@
end
context "and there are no changes" do
- let(:devices_edited) { false }
+ let(:actions) { false }
context "and the user accepts the dialog (next)" do
let(:dialog_result) { :next }
@@ -101,7 +102,7 @@
end
context "and there are changes" do
- let(:devices_edited) { true }
+ let(:actions) { true }
context "and the user accepts the dialog (next)" do
let(:dialog_result) { :next }
@@ -123,7 +124,7 @@
end
context "and there are no changes" do
- let(:devices_edited) { false }
+ let(:actions) { false }
context "and the user accepts the dialog (next)" do
let(:dialog_result) { :next }
@@ -133,7 +134,7 @@
end
context "and there are changes" do
- let(:devices_edited) { true }
+ let(:actions) { true }
before do
allow(Y2Partitioner::Dialogs::Summary).to
receive(:run).and_return(summary_result)
@@ -198,7 +199,7 @@
let(:installation) { false }
context "and there are no changes" do
- let(:devices_edited) { false }
+ let(:actions) { false }
it "returns 'Finish' label" do
expect(subject.next_button).to eq(Yast::Label.FinishButton)
@@ -206,7 +207,7 @@
end
context "and there are changes" do
- let(:devices_edited) { true }
+ let(:actions) { true }
it "returns 'Next' label" do
expect(subject.next_button).to eq(Yast::Label.NextButton)
@@ -217,7 +218,7 @@
shared_examples "quiting partitioner" do
context "when there are no changes" do
- let(:devices_edited) { false }
+ let(:actions) { false }
it "does not show a confirmation popup" do
expect(Yast2::Popup).to_not receive(:show)
@@ -231,7 +232,7 @@
end
context "when there are changes" do
- let(:devices_edited) { true }
+ let(:actions) { true }
before do
allow(Yast2::Popup).to receive(:show).and_return(accept)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-storage-ng-4.3.27/test/y2partitioner/dialogs/summary_test.rb
new/yast2-storage-ng-4.3.28/test/y2partitioner/dialogs/summary_test.rb
--- old/yast2-storage-ng-4.3.27/test/y2partitioner/dialogs/summary_test.rb
2020-12-04 13:27:17.000000000 +0100
+++ new/yast2-storage-ng-4.3.28/test/y2partitioner/dialogs/summary_test.rb
2020-12-10 10:12:46.000000000 +0100
@@ -1,5 +1,6 @@
#!/usr/bin/env rspec
-# Copyright (c) [2018] SUSE LLC
+
+# Copyright (c) [2018-2020] SUSE LLC
#
# All Rights Reserved.
#
@@ -43,7 +44,7 @@
describe "#abort_handler" do
before do
devicegraphs = Y2Partitioner::DeviceGraphs.instance
- allow(devicegraphs).to receive(:devices_edited?).and_return(true)
+ allow(devicegraphs).to receive(:actions?).and_return(true)
allow(Y2Partitioner::DeviceGraphs).to
receive(:instance).and_return(devicegraphs)
_______________________________________________
openSUSE Commits mailing list -- [email protected]
To unsubscribe, email [email protected]
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/[email protected]
