commit yast2-storage for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community,
here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at 2013-11-15 14:28:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2013-10-20 10:56:29.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes 2013-11-15 14:28:35.000000000 +0100
@@ -1,0 +2,23 @@
+Wed Nov 13 15:38:35 CET 2013 - aschnell@suse.de
+
+- use correct binary prefix (bnc#849276)
+- version 3.1.2
+
+-------------------------------------------------------------------
+Wed Nov 06 09:49:39 CET 2013 - aschnell@suse.de
+
+- do not install yast2-snapper if root is on btrfs (fate#314695)
+
+-------------------------------------------------------------------
+Mon Nov 04 16:42:35 CET 2013 - aschnell@suse.de
+
+- changed technique to ensure UTF-8 string in ruby (bnc#848812)
+
+-------------------------------------------------------------------
+Wed Oct 30 17:44:29 CET 2013 - aschnell@suse.de
+
+- handle device name change during update due to switch from
+ dmraid to mdadm (fate#316007)
+- version 3.1.1
+
+-------------------------------------------------------------------
@@ -6537 +6560 @@
-- allow arbitrary number of pathes for md raid
+- allow arbitrary number of paths for md raid
Old:
----
yast2-storage-3.1.0.tar.bz2
New:
----
yast2-storage-3.1.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.lJjr6u/_old 2013-11-15 14:28:36.000000000 +0100
+++ /var/tmp/diff_new_pack.lJjr6u/_new 2013-11-15 14:28:36.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-storage
-Version: 3.1.0
+Version: 3.1.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -26,8 +26,8 @@
BuildRequires: docbook-xsl-stylesheets
BuildRequires: doxygen
BuildRequires: gcc-c++
-BuildRequires: libstorage-devel >= 2.24.0
-BuildRequires: libstorage-ruby >= 2.25.0
+BuildRequires: libstorage-devel >= 2.25.3
+BuildRequires: libstorage-ruby >= 2.25.2
BuildRequires: libtool
BuildRequires: libxslt
BuildRequires: perl-XML-Writer
@@ -38,8 +38,8 @@
BuildRequires: yast2-core-devel >= 2.23.1
BuildRequires: yast2-devtools >= 3.0.6
BuildRequires: yast2-testsuite >= 2.19.0
-Requires: libstorage-ruby >= 2.25.0
-Requires: libstorage4 >= 2.24.5
+Requires: libstorage-ruby >= 2.25.2
+Requires: libstorage4 >= 2.25.2
Requires: rubygem-ruby-dbus
Requires: yast2 >= 2.19.4
Requires: yast2-core >= 2.18.3
++++++ yast2-storage-3.1.0.tar.bz2 -> yast2-storage-3.1.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.0/CONTRIBUTING.md new/yast2-storage-3.1.2/CONTRIBUTING.md
--- old/yast2-storage-3.1.0/CONTRIBUTING.md 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-3.1.2/CONTRIBUTING.md 2013-11-15 10:46:48.000000000 +0100
@@ -0,0 +1,87 @@
+YaST Contribution Guidelines
+============================
+
+YaST is an open source project and as such it welcomes all kinds of
+contributions. If you decide to contribute, please follow these guidelines to
+ensure the process is effective and pleasant both for you and YaST maintainers.
+
+There are two main forms of contribution: reporting bugs and performing code
+changes.
+
+Bug Reports
+-----------
+
+If you find a problem, please report it either using
+[Bugzilla](https://bugzilla.novell.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2)
+or [GitHub issues](../../issues). (For Bugzilla, use the [simplified
+registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp)
+if you don't have an account yet.)
+
+If you find a problem, please report it either using
+[Bugzilla](https://bugzilla.novell.com/) or GitHub issues. We can't guarantee
+that every bug will be fixed, but we'll try.
+
+When creating a bug report, please follow our [bug reporting
+guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug).
+
+Code Changes
+------------
+
+We welcome all kinds of code contributions, from simple bug fixes to significant
+refactorings and implementation of new features. However, before making any
+non-trivial contribution, get in touch with us first — this can prevent wasted
+effort on both sides. Also, have a look at our [development
+documentation](http://en.opensuse.org/openSUSE:YaST_development).
+
+To send us your code change, use GitHub pull requests. The workflow is as
+follows:
+
+ 1. Fork the project.
+
+ 2. Create a topic branch based on `master`.
+
+ 3. Implement your change, including tests (if possible). Make sure you adhere
+ to the [Ruby style
+ guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md).
+
+ 4. Make sure your change didn't break anything by building the RPM package
+ (`rake osc:build`). The build process includes running the full testsuite.
+
+ 5. Publish the branch and create a pull request.
+
+ 6. YaST developers will review your change and possibly point out issues.
+ Adapt the code under their guidance until they are all resolved.
+
+ 7. Finally, the pull request will get merged or rejected.
+
+See also [GitHub's guide on
+contributing](https://help.github.com/articles/fork-a-repo).
+
+If you want to do multiple unrelated changes, use separate branches and pull
+requests.
+
+Do not change the `VERSION` and `*.changes` files as this could lead to
+conflicts.
+
+### Commits
+
+Each commit in the pull request should do only one thing, which is clearly
+described by its commit message. Especially avoid mixing formatting changes and
+functional changes into one commit. When writing commit messages, adhere to
+[widely used
+conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+
+If your commit is related to a bug in Buzgilla or an issue on GitHub, make sure
+you mention it in the commit message for cross-reference. Use format like
+bnc#775814 or gh#yast/yast-foo#42. See also [GitHub
+autolinking](https://help.github.com/articles/github-flavored-markdown#references)
+and [openSUSE abbreviation
+reference](http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Current_set_of_...).
+
+Additional Information
+----------------------
+
+If you have any question, feel free to ask at the [development mailing
+list](http://lists.opensuse.org/yast-devel/) or at the
+[#yast](http://webchat.freenode.net/?channels=%23yast) IRC channel on freenode.
+We'll do our best to provide a timely and accurate answer.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.0/VERSION new/yast2-storage-3.1.2/VERSION
--- old/yast2-storage-3.1.0/VERSION 2013-10-17 13:34:02.000000000 +0200
+++ new/yast2-storage-3.1.2/VERSION 2013-11-15 10:46:48.000000000 +0100
@@ -1 +1 @@
-3.1.0
+3.1.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.0/package/yast2-storage.changes new/yast2-storage-3.1.2/package/yast2-storage.changes
--- old/yast2-storage-3.1.0/package/yast2-storage.changes 2013-10-17 13:34:02.000000000 +0200
+++ new/yast2-storage-3.1.2/package/yast2-storage.changes 2013-11-15 10:46:48.000000000 +0100
@@ -1,4 +1,27 @@
-------------------------------------------------------------------
+Wed Nov 13 15:38:35 CET 2013 - aschnell@suse.de
+
+- use correct binary prefix (bnc#849276)
+- version 3.1.2
+
+-------------------------------------------------------------------
+Wed Nov 06 09:49:39 CET 2013 - aschnell@suse.de
+
+- do not install yast2-snapper if root is on btrfs (fate#314695)
+
+-------------------------------------------------------------------
+Mon Nov 04 16:42:35 CET 2013 - aschnell@suse.de
+
+- changed technique to ensure UTF-8 string in ruby (bnc#848812)
+
+-------------------------------------------------------------------
+Wed Oct 30 17:44:29 CET 2013 - aschnell@suse.de
+
+- handle device name change during update due to switch from
+ dmraid to mdadm (fate#316007)
+- version 3.1.1
+
+-------------------------------------------------------------------
Thu Oct 17 13:40:27 CEST 2013 - fehr@suse.de
- propose to create bios_grub partition on gpt disk for non-EFI
@@ -6534,7 +6557,7 @@
-------------------------------------------------------------------
Thu Aug 1 16:17:07 CEST 2002 - fehr@suse.de
-- allow arbitrary number of pathes for md raid
+- allow arbitrary number of paths for md raid
-------------------------------------------------------------------
Thu Aug 1 13:38:48 CEST 2002 - fehr@suse.de
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.0/package/yast2-storage.spec new/yast2-storage-3.1.2/package/yast2-storage.spec
--- old/yast2-storage-3.1.0/package/yast2-storage.spec 2013-10-17 13:34:02.000000000 +0200
+++ new/yast2-storage-3.1.2/package/yast2-storage.spec 2013-11-15 10:46:48.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-storage
-Version: 3.1.0
+Version: 3.1.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -28,13 +28,15 @@
BuildRequires: gcc-c++ libtool
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files
-BuildRequires: libstorage-devel >= 2.24.0 yast2 >= 2.19.4 yast2-core-devel >= 2.23.1
+BuildRequires: libstorage-devel >= 2.25.3
+BuildRequires: yast2 >= 2.19.4
+BuildRequires: yast2-core-devel >= 2.23.1
BuildRequires: yast2-devtools >= 3.0.6
BuildRequires: yast2-testsuite >= 2.19.0
BuildRequires: rubygem-ruby-dbus
-BuildRequires: libstorage-ruby >= 2.25.0
-Requires: libstorage4 >= 2.24.5
-Requires: libstorage-ruby >= 2.25.0
+BuildRequires: libstorage-ruby >= 2.25.2
+Requires: libstorage4 >= 2.25.2
+Requires: libstorage-ruby >= 2.25.2
Requires: yast2-core >= 2.18.3 yast2 >= 2.19.4 yast2-libyui >= 2.18.7
Requires: rubygem-ruby-dbus
%ifarch s390 s390x
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.0/src/fillup/sysconfig.storage-yast2-storage new/yast2-storage-3.1.2/src/fillup/sysconfig.storage-yast2-storage
--- old/yast2-storage-3.1.0/src/fillup/sysconfig.storage-yast2-storage 2013-10-17 13:34:02.000000000 +0200
+++ new/yast2-storage-3.1.2/src/fillup/sysconfig.storage-yast2-storage 2013-11-15 10:46:48.000000000 +0100
@@ -18,4 +18,4 @@
# end_cyl num_cyl cyl_size fc_wwpn fc_fcp_lun fc_port_id encrypted
#
# Separate individual values by single space
-HIDDEN_FIELDS="uuid mount_by used_by bios_id fc_wwpn fc_fcp_lun fc_port_id"
+HIDDEN_FIELDS="bios_id fc_fcp_lun fc_port_id fc_wwpn mount_by used_by uuid"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.0/src/modules/FileSystems.rb new/yast2-storage-3.1.2/src/modules/FileSystems.rb
--- old/yast2-storage-3.1.0/src/modules/FileSystems.rb 2013-10-17 13:34:02.000000000 +0200
+++ new/yast2-storage-3.1.2/src/modules/FileSystems.rb 2013-11-15 10:46:48.000000000 +0100
@@ -29,7 +29,7 @@
#
#
# $Id$
-require "storage_utf8"
+require "storage"
require "yast"
module Yast
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.0/src/modules/Partitions.rb new/yast2-storage-3.1.2/src/modules/Partitions.rb
--- old/yast2-storage-3.1.0/src/modules/Partitions.rb 2013-10-17 13:34:02.000000000 +0200
+++ new/yast2-storage-3.1.2/src/modules/Partitions.rb 2013-11-15 10:46:48.000000000 +0100
@@ -27,7 +27,7 @@
# Purpose: Provides information about partitions
#
# $Id$
-require "storage_utf8"
+require "storage"
require "yast"
module Yast
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.0/src/modules/Storage.rb new/yast2-storage-3.1.2/src/modules/Storage.rb
--- old/yast2-storage-3.1.0/src/modules/Storage.rb 2013-10-17 13:34:02.000000000 +0200
+++ new/yast2-storage-3.1.2/src/modules/Storage.rb 2013-11-15 10:46:48.000000000 +0100
@@ -1,6 +1,6 @@
# encoding: utf-8
-# Copyright (c) 2012 Novell, Inc.
+# Copyright (c) [2012-2013] Novell, Inc.
#
# All Rights Reserved.
#
@@ -42,7 +42,7 @@
# $Id$
require "yast"
require "dbus"
-require "storage_utf8"
+require "storage"
module Yast
class StorageClass < Module
@@ -308,12 +308,31 @@
Storage()
end
+
def IsKernelDeviceName(device)
Builtins.substring(device, 0, 6) != "LABEL=" &&
Builtins.substring(device, 0, 5) != "UUID=" &&
Builtins.substring(device, 0, 13) != "/dev/disk/by-"
end
+
+ def DeviceNameMightNeedAdaption(device)
+
+ if IsKernelDeviceName(device)
+ return true
+ end
+
+ if device.start_with?("/dev/disk/by-id/raid-") ||
+ device.start_with?("/dev/disk/by-id/dm-name-") ||
+ device.start_with?("/dev/disk/by-id/dm-uuid-DMRAID-")
+ return true
+ end
+
+ return false
+
+ end
+
+
def InitLibstorage(readonly)
return true if @sint != nil
@@ -371,22 +390,22 @@
def ByteToHumanString(bytes)
- ::Storage::byteToHumanString(bytes, false, 2, false)
+ return ::Storage::byteToHumanString(bytes, false, 2, false).force_encoding("UTF-8")
end
def KByteToHumanString(bytes_k)
- ::Storage::byteToHumanString(bytes_k*1024, false, 2, false)
+ return ::Storage::byteToHumanString(bytes_k*1024, false, 2, false).force_encoding("UTF-8")
end
def ByteToHumanStringOmitZeroes(bytes)
- ::Storage::byteToHumanString(bytes, false, 2, true)
+ return ::Storage::byteToHumanString(bytes, false, 2, true).force_encoding("UTF-8")
end
def KByteToHumanStringOmitZeroes(bytes_k)
- ::Storage::byteToHumanString(bytes_k*1024, false, 2, true)
+ return ::Storage::byteToHumanString(bytes_k*1024, false, 2, true).force_encoding("UTF-8")
end
@@ -5253,7 +5272,7 @@
infos.each do |info|
m = {
:destructive => info.destructive,
- :text => info.text
+ :text => info.text.force_encoding("UTF-8")
}
ret.push(m)
end
@@ -5289,15 +5308,15 @@
def LastAction
- ret = @sint.getLastAction()
- ret
+ return @sint.getLastAction().force_encoding("UTF-8")
end
+
def ExtendedErrorMsg
- ret = @sint.getExtendedErrorMessage()
- ret
+ return @sint.getExtendedErrorMessage().force_encoding("UTF-8")
end
+
def SetZeroNewPartitions(val)
Builtins.y2milestone("SetZeroNewPartitions val:%1", val)
@sint.setZeroNewPartitions(val)
@@ -5845,7 +5864,7 @@
part = GetEntryForMountpoint("/")
if Ops.get_symbol(part, "used_fs", :unknown) == :btrfs
- pl << "snapper" << "yast2-snapper"
+ pl << "snapper"
end
Builtins.y2milestone("AddPackageList ret %1", pl)
@@ -6360,6 +6379,16 @@
end
+ def TranslateDeviceDmraidToMdadm(device, mapping)
+ ret = device
+ mapping.each do |name, uuid|
+ ret = ret.sub("/dev/disk/by-id/raid-" + name, "/dev/disk/by-id/md-uuid-" + uuid)
+ ret = ret.sub("/dev/disk/by-id/dm-name-" + name, "/dev/disk/by-id/md-uuid-" + uuid)
+ ret = ret.sub("/dev/disk/by-id/dm-uuid-DMRAID-" + name, "/dev/disk/by-id/md-uuid-" + uuid)
+ end
+ return ret
+ end
+
def GetTranslatedDevices(oldv, newv, names)
oldv = deep_copy(oldv)
@@ -6384,6 +6413,7 @@
"major",
0
) == 9
+
# convert EVMS names to LVM
# FIXME: add version checking, but does not seem necessary, since non-LVM
# installations will not be affected by this conversion at all
@@ -6393,6 +6423,13 @@
end
n
end
+
+ # convert dmraid names to mdadm names
+ mapping = GetDmraidToMdadm()
+ if !mapping.empty?
+ ret.map! { |name| TranslateDeviceDmraidToMdadm(name, mapping) }
+ end
+
Builtins.y2milestone("GetTranslatedDevices ret %1", ret)
deep_copy(ret)
end
@@ -6845,7 +6882,7 @@
ret = false
tg = GetTargetMap()
ts = fstab_spec
- if IsKernelDeviceName(fstab_spec)
+ if DeviceNameMightNeedAdaption(fstab_spec)
# translate fstab_spec from old to new kernel device name
ts = Ops.get(GetTranslatedDevices({}, {}, [fstab_spec]), 0, "")
if ts != fstab_spec
@@ -7025,8 +7062,9 @@
deep_copy(ret)
end
+
def GetDetectedDiskPaths
- ret = [];
+ ret = []
disks = ::Storage::getPresentDisks
disks.each do |d|
ret.push(d)
@@ -7035,6 +7073,18 @@
ret
end
+
+ def GetDmraidToMdadm()
+ mapping = {}
+ tmp = ::Storage::DmraidToMdadm()
+ tmp.each do |a, b|
+ mapping[a] = b
+ end
+ Builtins.y2milestone("dmraid to mdadm mapping %1", mapping)
+ return mapping
+ end
+
+
publish :variable => :resize_partition, :type => "string"
publish :variable => :resize_partition_data, :type => "map"
publish :variable => :resize_cyl_size, :type => "integer"
@@ -7218,6 +7268,7 @@
publish :function => :SLES9PersistentDevNames, :type => "string (string)"
publish :function => :HdDiskMap, :type => "string (string, map)"
publish :function => :BuildDiskmap, :type => "map (map)"
+ publish :function => :TranslateDeviceDmraidToMdadm, :type => "string (string, map
participants (1)
-
root@hilbert.suse.de