Hello community,
here is the log from the commit of package yast2-storage for openSUSE:Factory
checked in at 2017-06-20 09:32:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-storage (Old)
and /work/SRC/openSUSE:Factory/.yast2-storage.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-storage"
Tue Jun 20 09:32:28 2017 rev:294 rq:504189 version:3.2.16
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-storage/yast2-storage.changes
2017-06-12 15:12:37.899977321 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes
2017-06-20 09:32:31.066715355 +0200
@@ -1,0 +2,9 @@
+Fri Jun 16 08:07:04 UTC 2017 - igonzalezs...@suse.com
+
+- Fix Btrfs default subvolume name detection (bsc#1044434 and
+ bsc#1044250)
+- Mark the description of the first snapshot for translation
+ (bsc#988700)
+- 3.2.16
+
+-------------------------------------------------------------------
Old:
----
yast2-storage-3.2.15.tar.bz2
New:
----
yast2-storage-3.2.16.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.Z587FQ/_old 2017-06-20 09:32:31.762617180 +0200
+++ /var/tmp/diff_new_pack.Z587FQ/_new 2017-06-20 09:32:31.766616616 +0200
@@ -17,7 +17,7 @@
Name: yast2-storage
-Version: 3.2.15
+Version: 3.2.16
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-storage-3.2.15.tar.bz2 -> yast2-storage-3.2.16.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.2.15/package/yast2-storage.changes
new/yast2-storage-3.2.16/package/yast2-storage.changes
--- old/yast2-storage-3.2.15/package/yast2-storage.changes 2017-06-07
17:38:26.321891881 +0200
+++ new/yast2-storage-3.2.16/package/yast2-storage.changes 2017-06-16
14:01:45.973518659 +0200
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Fri Jun 16 08:07:04 UTC 2017 - igonzalezs...@suse.com
+
+- Fix Btrfs default subvolume name detection (bsc#1044434 and
+ bsc#1044250)
+- Mark the description of the first snapshot for translation
+ (bsc#988700)
+- 3.2.16
+
+-------------------------------------------------------------------
Wed Jun 7 17:28:46 CEST 2017 - shundham...@suse.de
- Fixed UI syntax error when adding tmpfs (bsc#1041737)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.2.15/package/yast2-storage.spec
new/yast2-storage-3.2.16/package/yast2-storage.spec
--- old/yast2-storage-3.2.15/package/yast2-storage.spec 2017-06-07
17:38:26.321891881 +0200
+++ new/yast2-storage-3.2.16/package/yast2-storage.spec 2017-06-16
14:01:45.973518659 +0200
@@ -17,7 +17,7 @@
Name: yast2-storage
-Version: 3.2.15
+Version: 3.2.16
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.2.15/src/modules/FileSystems.rb
new/yast2-storage-3.2.16/src/modules/FileSystems.rb
--- old/yast2-storage-3.2.15/src/modules/FileSystems.rb 2017-06-07
17:38:26.333891881 +0200
+++ new/yast2-storage-3.2.16/src/modules/FileSystems.rb 2017-06-16
14:01:45.989518659 +0200
@@ -2068,11 +2068,11 @@
# @return [String,nil] Default subvolume from the target system
def default_subvol_from_target
Yast.import "Storage"
- parts = Storage.GetTargetMap.map { |_k, d| d.fetch("partitions")
}.flatten.compact
+ parts = Storage.GetTargetMap.map { |_k, d| d.fetch("partitions", [])
}.flatten.compact
btrfs_parts = parts.select { |p| p["used_fs"] == :btrfs }
- default_subvol_names = btrfs_parts.reduce({}) do |memo, part|
- memo[part["mount"]] = btrfs_subvol_name_for(part["mount"]) unless
part["mount"].nil?
- memo
+ default_subvol_names = btrfs_parts.each_with_object({}) do |part, memo|
+ next if part["mount"].nil? || !::File.directory?(part["mount"])
+ memo[part["mount"]] = btrfs_subvol_name_for(part["mount"])
end
# Root takes precedence
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.2.15/src/modules/StorageSnapper.rb
new/yast2-storage-3.2.16/src/modules/StorageSnapper.rb
--- old/yast2-storage-3.2.15/src/modules/StorageSnapper.rb 2017-06-07
17:38:26.341891881 +0200
+++ new/yast2-storage-3.2.16/src/modules/StorageSnapper.rb 2017-06-16
14:01:45.993518659 +0200
@@ -77,9 +77,11 @@
part = Storage.GetEntryForMountpoint("/")
+ # TRANSLATORS: first snapshot description
+ snapshot_description = _("first root filesystem")
if bash_log_output("/usr/lib/snapper/installation-helper --step 1 " <<
"--device '#{String.Quote(part["device"])}' " <<
- "--description 'first root filesystem'") != 0
+ "--description
'#{String.Quote(snapshot_description)}'") != 0
log.error("configuring snapper for root fs failed")
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.2.15/test/filesystems_test.rb
new/yast2-storage-3.2.16/test/filesystems_test.rb
--- old/yast2-storage-3.2.15/test/filesystems_test.rb 2017-06-07
17:38:26.341891881 +0200
+++ new/yast2-storage-3.2.16/test/filesystems_test.rb 2017-06-16
14:01:45.997518659 +0200
@@ -23,15 +23,16 @@
end
describe "#default_subvol_from_target" do
+ let(:target_map) { YAML.load_file(File.join(FIXTURES_PATH,
"subvolumes.yml")) }
+
before do
allow(Yast::Storage).to receive(:GetTargetMap).and_return(target_map)
allow(Yast::ProductFeatures).to receive(:GetStringFeature)
.with("partitioning",
"btrfs_default_subvolume").and_return(default_subvol)
+ allow(File).to receive(:directory?).and_return(true)
end
context "when root partition uses the default subvolume name (@)" do
- let(:target_map) { YAML.load_file(File.join(FIXTURES_PATH,
"subvolumes.yml")) }
-
before do
allow(Yast::Execute).to receive(:on_target).with("btrfs", "subvol",
"list", "/", anything)
.and_return(btrfs_list_fixture("root"))
@@ -78,6 +79,19 @@
end
end
end
+
+ context "when a mount point does not exist" do
+ before do
+ allow(File).to receive(:directory?).with("/srv").and_return(false)
+ allow(Yast::Execute).to receive(:on_target).with("btrfs", "subvol",
"list", "/", anything)
+ .and_return(btrfs_list_fixture("root"))
+ end
+
+ it "ignores that partition" do
+ expect(Yast::Execute).to_not receive(:on_target).with("btrfs",
"subvol", "list", "/srv", anything)
+ subject.default_subvol_from_target
+ end
+ end
end
describe "#read_default_subvol_from_target" do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.2.15/test/fixtures/subvolumes.yml
new/yast2-storage-3.2.16/test/fixtures/subvolumes.yml
--- old/yast2-storage-3.2.15/test/fixtures/subvolumes.yml 2017-06-07
17:38:26.341891881 +0200
+++ new/yast2-storage-3.2.16/test/fixtures/subvolumes.yml 2017-06-16
14:01:45.997518659 +0200
@@ -107,6 +107,26 @@
uuid: 862e2cbf-0501-48a1-85a3-142bfe3ab51b
mount: "/srv"
mountby: :uuid
+ - device: "/dev/vdb3"
+ name: vdb3
+ used_by:
+ - type: :UB_BTRFS
+ device: 6e3713be-8adc-4e75-bd51-1826a74887e4
+ used_by_type: :UB_BTRFS
+ used_by_device: 6e3713be-8adc-4e75-bd51-1826a74887e4
+ size_k: 13925376
+ used_fs: :btrfs
+ detected_fs: :btrfs
+ fstopt: defaults
+ nr: 3
+ fsid: 131
+ fstype: Linux native
+ region:
+ - 1735
+ - 2035
+ type: :primary
+ boot: true
+ uuid: 6e3713be-8adc-4e75-bd51-1826a74887e4
size_k: 14680064
cyl_size: 8225280
cyl_count: 1827
@@ -121,6 +141,27 @@
used_by_device: ''
dasd_format: 0
dasd_type: 0
+"/dev/vdc":
+ unique: KSbE.Fxp0d3BezAE
+ bus: None
+ device: "/dev/vda"
+ bios_id: '0x80'
+ driver: virtio-pci
+ driver_module: virtio_pci
+ size_k: 14680064
+ cyl_size: 8225280
+ cyl_count: 1827
+ sector_size: 512
+ label: msdos
+ name: vdc
+ max_logical: 255
+ max_primary: 4
+ type: :CT_DISK
+ transport: :unknown
+ used_by_type: :UB_NONE
+ used_by_device: ''
+ dasd_format: 0
+ dasd_type: 0
"/dev/btrfs":
device: "/dev/btrfs"
name: btrfs
@@ -182,4 +223,4 @@
mountby: :uuid
ignore_fstab: true
type: :tmpfs
- fstype: TMPFS
\ No newline at end of file
+ fstype: TMPFS
