Merge pull request #77 from ancorgs/kill_legacy_api

Adapt to cleaned Y2Storage::StorageManager API
yast · Jul 26, 2017 · cc31d69 · cc31d69
2 parents f7c45fe + 3987c6a
commit cc31d69
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/package/yast2-update.changes b/package/yast2-update.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jul 24 15:52:26 UTC 2017 - ancor@suse.com
+
+- storage-ng: adapted calls to temporary y2storage_* methods, since
+  they were finally removed from Y2Storage::StorageManager.
+
 -------------------------------------------------------------------
 Wed Jul  5 15:04:22 CEST 2017 - shundhammer@suse.de
 

diff --git a/package/yast2-update.spec b/package/yast2-update.spec
@@ -41,9 +41,9 @@ BuildRequires:	yast2-installation-control
 # Needed for tests
 BuildRequires:  rubygem(rspec)
 
-BuildRequires:	yast2-storage-ng
-# EnumMappings with MOUNT_BY_TYPE
-Requires:	yast2-storage-ng >= 0.1.12
+BuildRequires:	yast2-storage-ng >= 0.1.32
+# New versions of StorageManager#probed and StorageManager#staging
+Requires:	yast2-storage-ng >= 0.1.32
 # FSSnapshotStore
 Requires:	yast2 >= 3.1.126
 Requires:	yast2-installation

diff --git a/src/modules/RootPart.rb b/src/modules/RootPart.rb
@@ -2158,11 +2158,11 @@ def load_saved(data)
   private
 
     def probed
-      Y2Storage::StorageManager.instance.y2storage_probed
+      Y2Storage::StorageManager.instance.probed
     end
 
     def staging
-      Y2Storage::StorageManager.instance.y2storage_staging
+      Y2Storage::StorageManager.instance.staging
     end
 
     def fstab_entry_matches?(entry, filesystem)