Hello community,
here is the log from the commit of package yast2-storage for openSUSE:Factory
checked in at 2013-11-28 19:10:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-11-22 07:29:43.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes
2013-11-28 19:10:17.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Nov 26 15:11:04 CET 2013 - aschn...@suse.de
+
+- disable btrfs multivolume support (bnc#832196)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage-3.1.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-3.1.2/package/yast2-storage.changes
new/yast2-storage-3.1.2/package/yast2-storage.changes
--- old/yast2-storage-3.1.2/package/yast2-storage.changes 2013-11-19
15:19:42.000000000 +0100
+++ new/yast2-storage-3.1.2/package/yast2-storage.changes 2013-11-26
17:29:50.000000000 +0100
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Tue Nov 26 15:11:04 CET 2013 - aschn...@suse.de
+
+- disable btrfs multivolume support (bnc#832196)
+
+-------------------------------------------------------------------
Tue Nov 19 15:15:29 CET 2013 - aschn...@suse.de
- removed code to translate EVMS device names during update (see
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-storage-3.1.2/src/include/partitioning/ep-btrfs.rb
new/yast2-storage-3.1.2/src/include/partitioning/ep-btrfs.rb
--- old/yast2-storage-3.1.2/src/include/partitioning/ep-btrfs.rb
2013-11-19 15:19:42.000000000 +0100
+++ new/yast2-storage-3.1.2/src/include/partitioning/ep-btrfs.rb
2013-11-26 17:29:50.000000000 +0100
@@ -1,6 +1,6 @@
# encoding: utf-8
-# Copyright (c) 2012 Novell, Inc.
+# Copyright (c) [2012-2013] Novell, Inc.
#
# All Rights Reserved.
#
@@ -32,27 +32,33 @@
Yast.include include_target, "partitioning/ep-btrfs-lib.rb"
end
+
def EpContextMenuBtrfs(device)
widget = ContextMenu.Simple(
[
+ # TRANSLATORS: context menu entry
Item(Id(:edit), _("Edit")),
- Item(Id(:delete), _("Delete")),
- Item(Id(:resize), _("Resize"))
+ # TRANSLATORS: context menu entry
+ # disabled, see bnc #832196
+ # Item(Id(:resize), _("Resize")),
+ # TRANSLATORS: context menu entry
+ Item(Id(:delete), _("Delete"))
]
)
case widget
when :edit
EpEditBtrfsDevice(device)
- when :delete
- EpDeleteBtrfsDevice(device)
when :resize
EpResizeBtrfsDevice(device)
+ when :delete
+ EpDeleteBtrfsDevice(device)
end
nil
end
+
def HandleBtrfsButtons(user_data, device, event)
user_data = deep_copy(user_data)
event = deep_copy(event)
@@ -84,11 +90,14 @@
EpEditBtrfsDevice(device)
when :resize
EpResizeBtrfsDevice(device)
+ when :delete
+ EpDeleteBtrfsDevice(device)
end
nil
end
+
def CreateBtrfsMainPanel(user_data)
user_data = deep_copy(user_data)
fields = StorageSettings.FilterTable(
@@ -127,11 +136,15 @@
),
ArrangeButtons(
[
+ # TRANSLATORS: push button text
PushButton(Id(:edit), Opt(:key_F4), _("Edit...")),
- # push button text
- PushButton(Id(:resize), Opt(:key_F8), _("Resize...")),
+ # TRANSLATORS: push button text
+ # disabled, see bnc #832196
+ # PushButton(Id(:resize), Opt(:key_F8), _("Resize...")),
+ # TRANSLATORS: push button text
+ PushButton(Id(:delete), Opt(:key_F5), _("Delete...")),
HStretch()
- ] # push button text
+ ]
)
)
)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
