Hello community,
here is the log from the commit of package yast2-storage for openSUSE:Factory
checked in at 2012-08-16 21:58:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-storage (Old)
and /work/SRC/openSUSE:Factory/.yast2-storage.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-storage", Maintainer is "aschn...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-storage/yast2-storage.changes
2012-08-08 11:58:33.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes
2012-08-16 21:58:37.000000000 +0200
@@ -1,0 +2,12 @@
+Mon Aug 13 16:02:08 CEST 2012 - f...@suse.de
+
+- 2.22.9
+- rename dm maps according to crypttab during update (bnc#774247)
+
+-------------------------------------------------------------------
+Wed Aug 8 13:31:00 CEST 2012 - f...@suse.de
+
+- 2.22.8
+- fix wrong proposal to format home when import fstab (bnc#774463)
+
+-------------------------------------------------------------------
Old:
----
yast2-storage-2.22.7.tar.bz2
New:
----
yast2-storage-2.22.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.zt8zl6/_old 2012-08-16 21:58:39.000000000 +0200
+++ /var/tmp/diff_new_pack.zt8zl6/_new 2012-08-16 21:58:39.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-storage
-Version: 2.22.7
+Version: 2.22.9
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -27,7 +27,7 @@
BuildRequires: docbook-xsl-stylesheets
BuildRequires: doxygen
BuildRequires: gcc-c++
-BuildRequires: libstorage-devel >= 2.22.5
+BuildRequires: libstorage-devel >= 2.22.10
BuildRequires: libtool
BuildRequires: libxslt
BuildRequires: openssl-devel
@@ -82,6 +82,7 @@
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
+%{?suse_update_config:%{suse_update_config -f}}
./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir}
# V=1: verbose build in case we used AM_SILENT_RULES(yes)
# so that RPM_OPT_FLAGS check works
++++++ yast2-storage-2.22.7.tar.bz2 -> yast2-storage-2.22.9.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-2.22.7/COPYING
new/yast2-storage-2.22.9/COPYING
--- old/yast2-storage-2.22.7/COPYING 2012-08-07 12:27:08.000000000 +0200
+++ new/yast2-storage-2.22.9/COPYING 2012-08-13 17:24:07.000000000 +0200
@@ -1,12 +1,12 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
+ Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -15,7 +15,7 @@
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
+the GNU Library General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@
The precise terms and conditions for copying, distribution and
modification follow.
-
- GNU GENERAL PUBLIC LICENSE
+
+ GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
-
+
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
-
+
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
-
+
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
- NO WARRANTY
+ NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@@ -277,9 +277,9 @@
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
@@ -303,16 +303,17 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
- Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
@@ -335,5 +336,5 @@
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
+library. If this is what you want to do, use the GNU Library General
Public License instead of this License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-2.22.7/Makefile.am.common
new/yast2-storage-2.22.9/Makefile.am.common
--- old/yast2-storage-2.22.7/Makefile.am.common 2012-08-07 12:23:54.000000000
+0200
+++ new/yast2-storage-2.22.9/Makefile.am.common 2012-07-24 19:02:20.000000000
+0200
@@ -30,7 +30,7 @@
dist-hook: check-syntax
CHECK_SYNTAX = true
-check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles)
+check-syntax: $(client_DATA) $(ycpchook)
@if test "$(client_DATA)"; then \
if $(CHECK_SYNTAX); then \
TO_CHECK="$(filter %.ycp,$^)"; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-2.22.7/VERSION
new/yast2-storage-2.22.9/VERSION
--- old/yast2-storage-2.22.7/VERSION 2012-08-07 12:23:07.000000000 +0200
+++ new/yast2-storage-2.22.9/VERSION 2012-08-13 16:02:37.000000000 +0200
@@ -1 +1 @@
-2.22.7
+2.22.9
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-2.22.7/bindings/ycp/Makefile.in
new/yast2-storage-2.22.9/bindings/ycp/Makefile.in
--- old/yast2-storage-2.22.7/bindings/ycp/Makefile.in 2012-08-07
12:24:00.000000000 +0200
+++ new/yast2-storage-2.22.9/bindings/ycp/Makefile.in 2012-07-24
19:02:38.000000000 +0200
@@ -20,7 +20,7 @@
#
# -*- makefile -*- Automake include file
-# $Id$
+# $Id: pluglib-bindings.ami 49069 2008-07-14 15:34:10Z mvidner $
# Wraps a pluglib for use by YaST. Done by using Swig for Perl, adding
# type information. Compiles, installs.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-2.22.7/configure
new/yast2-storage-2.22.9/configure
--- old/yast2-storage-2.22.7/configure 2012-08-07 12:23:59.000000000 +0200
+++ new/yast2-storage-2.22.9/configure 2012-07-24 19:02:35.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for yast2-storage 2.22.7.
+# Generated by GNU Autoconf 2.68 for yast2-storage 2.22.6.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -570,8 +570,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-storage'
PACKAGE_TARNAME='yast2-storage'
-PACKAGE_VERSION='2.22.7'
-PACKAGE_STRING='yast2-storage 2.22.7'
+PACKAGE_VERSION='2.22.6'
+PACKAGE_STRING='yast2-storage 2.22.6'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1359,7 +1359,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-storage 2.22.7 to adapt to many kinds of systems.
+\`configure' configures yast2-storage 2.22.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1430,7 +1430,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-storage 2.22.7:";;
+ short | recursive ) echo "Configuration of yast2-storage 2.22.6:";;
esac
cat <<\_ACEOF
@@ -1546,7 +1546,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-storage configure 2.22.7
+yast2-storage configure 2.22.6
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1999,7 +1999,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-storage $as_me 2.22.7, which was
+It was created by yast2-storage $as_me 2.22.6, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2929,7 +2929,7 @@
# Define the identity of the package.
PACKAGE='yast2-storage'
- VERSION='2.22.7'
+ VERSION='2.22.6'
cat >>confdefs.h <<_ACEOF
@@ -3051,7 +3051,7 @@
-VERSION="2.22.7"
+VERSION="2.22.6"
RPMNAME="yast2-storage"
MAINTAINER="Arvin Schnell <aschn...@suse.de>"
@@ -5328,10 +5328,10 @@
fi
-CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
+CFLAGS="${CFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2"
-: ${AGENT_LIBADD:='-L$(libdir) -lscr -ly2util -lycpvalues'}
+: ${AGENT_LIBADD:='-L$(libdir) -lscr'}
# Check whether --enable-static was given.
@@ -16718,7 +16718,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-storage $as_me 2.22.7, which was
+This file was extended by yast2-storage $as_me 2.22.6, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16784,7 +16784,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-storage config.status 2.22.7
+yast2-storage config.status 2.22.6
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-2.22.7/configure.in
new/yast2-storage-2.22.9/configure.in
--- old/yast2-storage-2.22.7/configure.in 2012-08-07 12:23:54.000000000
+0200
+++ new/yast2-storage-2.22.9/configure.in 2012-07-24 19:02:20.000000000
+0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-storage
dnl
-dnl -- This file is generated by y2autoconf 2.23.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.21.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-storage, 2.22.7, http://bugs.opensuse.org/, yast2-storage)
+AC_INIT(yast2-storage, 2.22.6, http://bugs.opensuse.org/, yast2-storage)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.22.7"
+VERSION="2.22.6"
RPMNAME="yast2-storage"
MAINTAINER="Arvin Schnell <aschn...@suse.de>"
@@ -178,10 +178,10 @@
PKG_CHECK_MODULES(Y2CORE, yast2-core)
])
-CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
+CFLAGS="${CFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2"
-: ${AGENT_LIBADD:='-L$(libdir) -lscr -ly2util -lycpvalues'}
+: ${AGENT_LIBADD:='-L$(libdir) -lscr'}
AC_SUBST(AGENT_LIBADD)
AC_DISABLE_STATIC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-2.22.7/data/Makefile.in
new/yast2-storage-2.22.9/data/Makefile.in
--- old/yast2-storage-2.22.7/data/Makefile.in 2012-08-07 12:24:00.000000000
+0200
+++ new/yast2-storage-2.22.9/data/Makefile.in 2012-07-24 19:02:38.000000000
+0200
@@ -518,7 +518,7 @@
rm ${NEWDEP}
dist-hook: check-syntax
-check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles)
+check-syntax: $(client_DATA) $(ycpchook)
@if test "$(client_DATA)"; then \
if $(CHECK_SYNTAX); then \
TO_CHECK="$(filter %.ycp,$^)"; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-2.22.7/pluglib-bindings.ami
new/yast2-storage-2.22.9/pluglib-bindings.ami
--- old/yast2-storage-2.22.7/pluglib-bindings.ami 2012-08-07
12:23:54.000000000 +0200
+++ new/yast2-storage-2.22.9/pluglib-bindings.ami 2012-07-24
19:02:20.000000000 +0200
@@ -1,5 +1,5 @@
# -*- makefile -*- Automake include file
-# $Id$
+# $Id: pluglib-bindings.ami 49069 2008-07-14 15:34:10Z mvidner $
# Wraps a pluglib for use by YaST. Done by using Swig for Perl, adding
# type information. Compiles, installs.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-2.22.7/storage/src/Makefile.in
new/yast2-storage-2.22.9/storage/src/Makefile.in
--- old/yast2-storage-2.22.7/storage/src/Makefile.in 2012-08-07
12:24:00.000000000 +0200
+++ new/yast2-storage-2.22.9/storage/src/Makefile.in 2012-07-24
19:02:39.000000000 +0200
@@ -734,7 +734,7 @@
rm ${NEWDEP}
dist-hook: check-syntax
-check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles)
+check-syntax: $(client_DATA) $(ycpchook)
@if test "$(client_DATA)"; then \
if $(CHECK_SYNTAX); then \
TO_CHECK="$(filter %.ycp,$^)"; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-storage-2.22.7/storage/src/modules/FileSystems.ycp
new/yast2-storage-2.22.9/storage/src/modules/FileSystems.ycp
--- old/yast2-storage-2.22.7/storage/src/modules/FileSystems.ycp
2012-08-07 12:17:34.000000000 +0200
+++ new/yast2-storage-2.22.9/storage/src/modules/FileSystems.ycp
2012-08-08 13:27:16.000000000 +0200
@@ -85,7 +85,7 @@
global const list<symbol> possible_root_fs = [ `ext2, `ext3, `ext4,
`btrfs, `reiser, `xfs ];
- global list<string> system_m_points() { return [ "/", "/home", "/var",
"/opt", Partitions::BootMount() ]; }
+ global list<string> system_m_points() { return [ "/", "/usr", "/var",
"/opt", Partitions::BootMount() ]; }
global list<string> crypt_m_points() { return [ "/",
Partitions::BootMount(), "/usr" ]; }
global const list<string> swap_m_points = [ "swap" ];
global const list<string> tmp_m_points = [ "/tmp", "/var/tmp" ];
@@ -101,10 +101,16 @@
{
if( size(suggest_m_points)==0 )
{
- suggest_m_points = [ "/srv", "/tmp", "/usr/local" ];
+ suggest_m_points = [ "/home", "/srv", "/tmp", "/usr/local" ];
+ map<string,integer> order_m_mpoints = $[ "/" : 1, "/home" : 2, "/var"
: 3, "/opt" : 4,
+ Partitions::BootMount() : 5 ];
+ list<string> non_proposed_m_points = [ "/usr" ];
if( Stage::initial() )
suggest_m_points = (list<string>)union( system_m_points(),
suggest_m_points );
+ suggest_m_points = filter( string s, suggest_m_points, ``(!contains(
non_proposed_m_points, s )));
+ suggest_m_points = sort( string a, string b, suggest_m_points,
+
``((order_m_mpoints[a]:99==order_m_mpoints[b]:99)?(a<=b):(order_m_mpoints[a]:99<=order_m_mpoints[b]:99)));
y2milestone( "SuggestMPoints init:%1", suggest_m_points );
}
return( suggest_m_points );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-2.22.7/storage/src/modules/Makefile.in
new/yast2-storage-2.22.9/storage/src/modules/Makefile.in
--- old/yast2-storage-2.22.7/storage/src/modules/Makefile.in 2012-08-07
12:24:00.000000000 +0200
+++ new/yast2-storage-2.22.9/storage/src/modules/Makefile.in 2012-07-24
19:02:39.000000000 +0200
@@ -540,7 +540,7 @@
rm ${NEWDEP}
dist-hook: check-syntax
-check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles)
+check-syntax: $(client_DATA) $(ycpchook)
@if test "$(client_DATA)"; then \
if $(CHECK_SYNTAX); then \
TO_CHECK="$(filter %.ycp,$^)"; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-2.22.7/storage/src/modules/Storage.ycp
new/yast2-storage-2.22.9/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.22.7/storage/src/modules/Storage.ycp 2012-07-30
12:13:54.000000000 +0200
+++ new/yast2-storage-2.22.9/storage/src/modules/Storage.ycp 2012-08-13
16:50:17.000000000 +0200
@@ -3889,6 +3889,37 @@
return( target );
}
+global void ChangeDmNamesFromCrypttab( string crfile )
+ {
+ map st = (map)SCR::Read( .target.stat, crfile );
+ y2milestone( "ChangeDmNamesFromCrypttab crfile:%1 st:%2", crfile, st );
+ if( st["size"]:0>0 )
+ {
+ import "AsciiFile";
+ map cr = $[];
+ AsciiFile::SetDelimiter( cr, " \t" );
+ AsciiFile::ReadFile( cr, crfile );
+ integer i=1;
+ integer r=0;
+ while( i<=AsciiFile::NumLines(cr) )
+ {
+ map l = AsciiFile::GetLine(cr,i);
+ y2milestone( "ChangeDmNamesFromCrypttab line:%1 is:%2", i, l );
+ string dev = l["fields",1]:"";
+ string nm = l["fields",0]:"";
+ if( !isempty(dev) && !isempty(nm) )
+ {
+ r = LibStorage::StorageInterface::renameCryptDm(sint, dev, nm);
+ y2milestone( "ChangeDmNamesFromCrypttab rename dm of %1 to %2
ret:%3",
+ dev, nm, r );
+ }
+ i=i+1;
+ }
+ LibStorage::StorageInterface::dumpObjectList(sint);
+ }
+ }
+
+
map<string, map> AddProposalName(map<string, map> target_map)
{
integer ide_disk_count = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-storage-2.22.7/storage/src/proposal/Makefile.in
new/yast2-storage-2.22.9/storage/src/proposal/Makefile.in
--- old/yast2-storage-2.22.7/storage/src/proposal/Makefile.in 2012-08-07
12:24:00.000000000 +0200
+++ new/yast2-storage-2.22.9/storage/src/proposal/Makefile.in 2012-07-24
19:02:39.000000000 +0200
@@ -518,7 +518,7 @@
rm ${NEWDEP}
dist-hook: check-syntax
-check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles)
+check-syntax: $(client_DATA) $(ycpchook)
@if test "$(client_DATA)"; then \
if $(CHECK_SYNTAX); then \
TO_CHECK="$(filter %.ycp,$^)"; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-2.22.7/storage.pot
new/yast2-storage-2.22.9/storage.pot
--- old/yast2-storage-2.22.7/storage.pot 2012-07-23 15:48:39.000000000
+0200
+++ new/yast2-storage-2.22.9/storage.pot 2012-07-23 15:49:00.000000000
+0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-23 15:48+0200\n"
+"POT-Creation-Date: 2012-07-23 15:49+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <l...@li.org>\n"
@@ -567,7 +567,7 @@
#. Label: get same password again for verification
#. Please use newline if label is longer than 40 characters
#: storage/src/include/custom_part_dialogs.ycp:141
-#: storage/src/include/ep-dialogs.ycp:574 storage/src/modules/Storage.ycp:3647
+#: storage/src/include/ep-dialogs.ycp:574 storage/src/modules/Storage.ycp:3660
msgid "Reenter the Password for &Verification:"
msgstr ""
@@ -586,7 +586,7 @@
#. popup text
#: storage/src/include/custom_part_dialogs.ycp:189
-#: storage/src/modules/Storage.ycp:3605
+#: storage/src/modules/Storage.ycp:3618
msgid ""
"You did not enter a password.\n"
"Try again.\n"
@@ -594,7 +594,7 @@
#. popup text
#: storage/src/include/custom_part_dialogs.ycp:200
-#: storage/src/modules/Storage.ycp:3616
+#: storage/src/modules/Storage.ycp:3629
#, ycp-format
msgid ""
"The password must have at least %1 characters.\n"
@@ -900,7 +900,7 @@
#. button text
#. push button text
#: storage/src/include/custom_part_dialogs.ycp:1352
-#: storage/src/modules/DualMultiSelectionBox.ycp:79
+#: storage/src/modules/DualMultiSelectionBox.ycp:115
msgid "Remove"
msgstr ""
@@ -2987,14 +2987,14 @@
#: storage/src/include/ep-raid-dialogs.ycp:240
msgid ""
"The parity algorithm to use with RAID5/6.\n"
-"Left-symmetric is the one that offers maximum performance on typical disks
with rotating platters.</p>\n"
+"Left-symmetric is the one that offers maximum performance on typical disks
with rotating platters.\n"
msgstr ""
#. helptext
#: storage/src/include/ep-raid-dialogs.ycp:245
msgid ""
"For further details regarding the parity \n"
-"algorithm please look at the man page for mdadm (man mdadm).</p>\n"
+"algorithm please look at the man page for mdadm (man mdadm).\n"
msgstr ""
#. Column header
@@ -3037,19 +3037,19 @@
msgstr ""
#. error popup
-#: storage/src/include/ep-raid-lib.ycp:71
+#: storage/src/include/ep-raid-lib.ycp:85
msgid "There are not enough suitable unused devices to create a RAID."
msgstr ""
#. error popup
-#: storage/src/include/ep-raid-lib.ycp:118
-#: storage/src/include/ep-raid-lib.ycp:150
-#: storage/src/include/ep-raid-lib.ycp:206
+#: storage/src/include/ep-raid-lib.ycp:132
+#: storage/src/include/ep-raid-lib.ycp:164
+#: storage/src/include/ep-raid-lib.ycp:209
msgid "No RAID selected."
msgstr ""
#. error popup, %1 is replaced by device name e.g. /dev/md1
-#: storage/src/include/ep-raid-lib.ycp:128
+#: storage/src/include/ep-raid-lib.ycp:142
#, ycp-format
msgid ""
"The RAID %1 is in use. It cannot be\n"
@@ -3057,7 +3057,7 @@
msgstr ""
#. error popup, %1 is replaced by device name e.g. /dev/md1
-#: storage/src/include/ep-raid-lib.ycp:160
+#: storage/src/include/ep-raid-lib.ycp:174
#, ycp-format
msgid ""
"The RAID %1 is already created on disk. It cannot be\n"
@@ -3065,18 +3065,13 @@
msgstr ""
#. error popup, %1 is replaced by device name e.g. /dev/md1
-#: storage/src/include/ep-raid-lib.ycp:168
+#: storage/src/include/ep-raid-lib.ycp:182
#, ycp-format
msgid ""
"The RAID %1 is in use. It cannot be\n"
"resized. To resize %1, make sure it is not used."
msgstr ""
-#. error popup
-#: storage/src/include/ep-raid-lib.ycp:190
-msgid "Failed to remove some devices."
-msgstr ""
-
#. push button text
#: storage/src/include/ep-raid.ycp:120
msgid "Add RAID..."
@@ -3836,32 +3831,165 @@
msgstr ""
#. footer text, %1 is replaced by size
-#: storage/src/modules/DevicesSelectionBox.ycp:81
+#: storage/src/modules/DevicesSelectionBox.ycp:80
#, ycp-format
msgid "Total size: %1"
msgstr ""
#. footer text, %1 is replaced by size
-#: storage/src/modules/DevicesSelectionBox.ycp:89
+#: storage/src/modules/DevicesSelectionBox.ycp:88
#, ycp-format
msgid "Resulting size: %1"
msgstr ""
+#. button text
+#: storage/src/modules/DualMultiSelectionBox.ycp:82
+#: storage/src/modules/DualMultiSelectionBox.ycp:243
+#: storage/src/modules/DualMultiSelectionBox.ycp:308
+msgid "Class"
+msgstr ""
+
+#: storage/src/modules/DualMultiSelectionBox.ycp:89
+msgid "Top"
+msgstr ""
+
+#: storage/src/modules/DualMultiSelectionBox.ycp:91
+msgid "Up"
+msgstr ""
+
+#: storage/src/modules/DualMultiSelectionBox.ycp:93
+msgid "Down"
+msgstr ""
+
+#: storage/src/modules/DualMultiSelectionBox.ycp:95
+msgid "Bottom"
+msgstr ""
+
+#: storage/src/modules/DualMultiSelectionBox.ycp:97
+msgid "Classify"
+msgstr ""
+
#. push button text
-#: storage/src/modules/DualMultiSelectionBox.ycp:74
+#: storage/src/modules/DualMultiSelectionBox.ycp:110
msgid "Add"
msgstr ""
#. push button text
-#: storage/src/modules/DualMultiSelectionBox.ycp:76
+#: storage/src/modules/DualMultiSelectionBox.ycp:112
msgid "Add All"
msgstr ""
#. push button text
-#: storage/src/modules/DualMultiSelectionBox.ycp:81
+#: storage/src/modules/DualMultiSelectionBox.ycp:117
msgid "Remove All"
msgstr ""
+#. error popup text
+#: storage/src/modules/DualMultiSelectionBox.ycp:144
+#, ycp-format
+msgid "File %1 is not a regular file!"
+msgstr ""
+
+#. error popup text
+#: storage/src/modules/DualMultiSelectionBox.ycp:151
+#, ycp-format
+msgid "File %1 is too big!"
+msgstr ""
+
+#. error popup text
+#: storage/src/modules/DualMultiSelectionBox.ycp:166
+msgid ""
+"Pattern file has invalid format!\n"
+"\n"
+"The file needs to contain lines with a regular expression and a class name\n"
+"per line. Example:"
+msgstr ""
+
+#. popup text
+#: storage/src/modules/DualMultiSelectionBox.ycp:183
+msgid "Detected following pattern lines:"
+msgstr ""
+
+#: storage/src/modules/DualMultiSelectionBox.ycp:189
+msgid "Ok to match devices to classes with these patterns?"
+msgstr ""
+
+#. dialog help text
+#: storage/src/modules/DualMultiSelectionBox.ycp:248
+msgid ""
+"<p>This dialog is for defining classes for the raid devices\n"
+"contained in the raid. Available classes are A, B, C, D and E but for many
cases\n"
+"fewer classes are needed (e.g. only A and B). </p>"
+msgstr ""
+
+#. dialog help text
+#: storage/src/modules/DualMultiSelectionBox.ycp:252
+#, ycp-format
+msgid ""
+"<p>You can put a device into a class by right-clicking on the\n"
+"device and choosing the appropriate class from context menu. By pressing the
\n"
+"Ctrl or Shift key you can select multiple devices and put them into a class
in\n"
+"one step. One can also use the buttons labeled \"%1\" to \"%2\" to put
currently \n"
+"selected devices into this class.</p>"
+msgstr ""
+
+#. dialog help text
+#: storage/src/modules/DualMultiSelectionBox.ycp:259
+#, ycp-format
+msgid ""
+"<p>After choosing classes for devices you can order the \n"
+"devices by pressing one of the buttons labeled \"%1\" or \"%2\"."
+msgstr ""
+
+#. dialog help text
+#: storage/src/modules/DualMultiSelectionBox.ycp:264
+msgid ""
+"<b>Sorted</b> puts all devices of class A before all devices\n"
+"of class B and so on."
+msgstr ""
+
+#. dialog help text
+#: storage/src/modules/DualMultiSelectionBox.ycp:268
+msgid ""
+"<b>Interleaved</b> uses first device of class A, then first device of \n"
+"class B until all classes with assigned devices. The comes second device of
class A,\n"
+"econd device of class B and so on."
+msgstr ""
+
+#. dialog help text
+#: storage/src/modules/DualMultiSelectionBox.ycp:273
+msgid ""
+"All devices withou a class are sorted to the end of devices list.\n"
+"When you leave the popup the current order is used as order of devices in the
RAID to\n"
+"be created.</p>"
+msgstr ""
+
+#. dialog help text
+#: storage/src/modules/DualMultiSelectionBox.ycp:277
+#, ycp-format
+msgid ""
+"By pressing button \"<b>%1</b>\" you can select a file that contains\n"
+"lines with a regular expression and a class name (e.g. \"sda.* A\"). All
devices that match \n"
+"the regular expression will be put into the class on this line. The regular
expression is \n"
+"matched against the kernel name (e.g. /dev/sda1), \n"
+"the udev path name (e.g.
/dev/disk/by-path/pci-0000:00:1f.2-scsi-0:0:0:0-part1) and the\n"
+"the udev id (e.g. /dev/disk/by-id/ata-ST3500418AS_9VMN8X8L-part1). \n"
+"The first match finally determines the class if a devices name matches more
then one\n"
+"regular expression.</p>"
+msgstr ""
+
+#. headline text
+#. Column header
+#: storage/src/modules/DualMultiSelectionBox.ycp:308
+#: storage/src/modules/StorageFields.ycp:117
+msgid "Device"
+msgstr ""
+
+#. headline text
+#: storage/src/modules/DualMultiSelectionBox.ycp:404
+msgid "Pattern File"
+msgstr ""
+
#. button text
#: storage/src/modules/FileSystems.ycp:215
msgid "Mount &Read-Only"
@@ -4341,7 +4469,7 @@
msgid "Resize Not Possible:"
msgstr ""
-#: storage/src/modules/Storage.ycp:2568 storage/src/modules/Storage.ycp:3570
+#: storage/src/modules/Storage.ycp:2568 storage/src/modules/Storage.ycp:3583
#, ycp-format
msgid ""
"Could not set encryption.\n"
@@ -4351,7 +4479,7 @@
msgstr ""
#. popup text
-#: storage/src/modules/Storage.ycp:3594
+#: storage/src/modules/Storage.ycp:3607
msgid ""
"The first and the second version\n"
"of the password do not match.\n"
@@ -4359,7 +4487,7 @@
msgstr ""
#. popup text
-#: storage/src/modules/Storage.ycp:3626
+#: storage/src/modules/Storage.ycp:3639
msgid ""
"The password may only contain the following characters:\n"
"0..9, a..z, A..Z, and any of \"@#* ,.;:._-+=!$%&/|?{[()]}^\\<>\".\n"
@@ -4368,23 +4496,23 @@
#. Label: get password for encrypted volume
#. Please use newline if label is longer than 40 characters
-#: storage/src/modules/Storage.ycp:3672
+#: storage/src/modules/Storage.ycp:3685
msgid "&Enter Encryption Password:"
msgstr ""
-#: storage/src/modules/Storage.ycp:3729
+#: storage/src/modules/Storage.ycp:3742
msgid "Provide Password"
msgstr ""
-#: storage/src/modules/Storage.ycp:3739
+#: storage/src/modules/Storage.ycp:3752
msgid "The following encrypted volumes are already available."
msgstr ""
-#: storage/src/modules/Storage.ycp:3754
+#: storage/src/modules/Storage.ycp:3767
msgid "Encrypted Volume Activation"
msgstr ""
-#: storage/src/modules/Storage.ycp:3756
+#: storage/src/modules/Storage.ycp:3769
msgid ""
"The following volumes contain an encryption signature but the \n"
"passwords are not yet known.\n"
@@ -4392,12 +4520,12 @@
"during an update or if they contain an encrypted LVM physical volume."
msgstr ""
-#: storage/src/modules/Storage.ycp:3764
+#: storage/src/modules/Storage.ycp:3777
msgid "Do you want to provide encryption passwords?"
msgstr ""
#. text in help field
-#: storage/src/modules/Storage.ycp:3807
+#: storage/src/modules/Storage.ycp:3820
msgid ""
"Enter encryption password for any of the\n"
"devices in the locked devices list.\n"
@@ -4405,53 +4533,53 @@
msgstr ""
#. header text
-#: storage/src/modules/Storage.ycp:3811
+#: storage/src/modules/Storage.ycp:3824
msgid "Enter Encryption Password"
msgstr ""
-#: storage/src/modules/Storage.ycp:3814
+#: storage/src/modules/Storage.ycp:3827
msgid "There are no encrypted volume to unlock."
msgstr ""
#. label text, multiple device names follow
-#: storage/src/modules/Storage.ycp:3822
+#: storage/src/modules/Storage.ycp:3835
msgid "Provide password for any of the following devices:"
msgstr ""
#. label text, one device name follows
-#: storage/src/modules/Storage.ycp:3825
+#: storage/src/modules/Storage.ycp:3838
msgid "Provide password for the following device:"
msgstr ""
-#: storage/src/modules/Storage.ycp:3837
+#: storage/src/modules/Storage.ycp:3850
msgid "Trying to unlock encrypted volumes..."
msgstr ""
-#: storage/src/modules/Storage.ycp:3858
+#: storage/src/modules/Storage.ycp:3871
msgid "Password did not unlock any volume."
msgstr ""
-#: storage/src/modules/Storage.ycp:3900
+#: storage/src/modules/Storage.ycp:3913
msgid "IDE Disk"
msgstr ""
-#: storage/src/modules/Storage.ycp:3903
+#: storage/src/modules/Storage.ycp:3916
msgid "SCSI Disk"
msgstr ""
-#: storage/src/modules/Storage.ycp:3906
+#: storage/src/modules/Storage.ycp:3919
msgid "Disk"
msgstr ""
-#: storage/src/modules/Storage.ycp:3922
+#: storage/src/modules/Storage.ycp:3935
msgid "DM RAID"
msgstr ""
-#: storage/src/modules/Storage.ycp:3933
+#: storage/src/modules/Storage.ycp:3946
msgid "MD RAID"
msgstr ""
-#: storage/src/modules/Storage.ycp:4512
+#: storage/src/modules/Storage.ycp:4525
#, ycp-format
msgid ""
"\n"
@@ -4459,7 +4587,7 @@
"that is needed to run the installation.\n"
msgstr ""
-#: storage/src/modules/Storage.ycp:4524
+#: storage/src/modules/Storage.ycp:4537
#, ycp-format
msgid ""
"\n"
@@ -4467,7 +4595,7 @@
"data needed to perform the installation.\n"
msgstr ""
-#: storage/src/modules/Storage.ycp:4545
+#: storage/src/modules/Storage.ycp:4558
#, ycp-format
msgid ""
"\n"
@@ -4475,7 +4603,7 @@
"that is needed to run the installation.\n"
msgstr ""
-#: storage/src/modules/Storage.ycp:4552
+#: storage/src/modules/Storage.ycp:4565
#, ycp-format
msgid ""
"\n"
@@ -4483,7 +4611,7 @@
"data needed to perform the installation.\n"
msgstr ""
-#: storage/src/modules/Storage.ycp:4578
+#: storage/src/modules/Storage.ycp:4591
#, ycp-format
msgid ""
"\n"
@@ -4492,7 +4620,7 @@
"the installation.\n"
msgstr ""
-#: storage/src/modules/Storage.ycp:4586
+#: storage/src/modules/Storage.ycp:4599
#, ycp-format
msgid ""
"\n"
@@ -4500,7 +4628,7 @@
"device %2, which contains data needed to perform the installation.\n"
msgstr ""
-#: storage/src/modules/Storage.ycp:4601
+#: storage/src/modules/Storage.ycp:4614
#, ycp-format
msgid ""
"\n"
@@ -4508,15 +4636,15 @@
"disk %2 are used.\n"
msgstr ""
-#: storage/src/modules/Storage.ycp:4684
+#: storage/src/modules/Storage.ycp:4697
msgid "Nothing assigned as root filesystem!"
msgstr ""
-#: storage/src/modules/Storage.ycp:4685
+#: storage/src/modules/Storage.ycp:4698
msgid "Installation will most certainly fail fatally!"
msgstr ""
-#: storage/src/modules/Storage.ycp:5222
+#: storage/src/modules/Storage.ycp:5235
#, ycp-format
msgid "Adding the following resolvables failed: %1"
msgstr ""
@@ -4552,11 +4680,6 @@
msgstr ""
#. Column header
-#: storage/src/modules/StorageFields.ycp:117
-msgid "Device"
-msgstr ""
-
-#. Column header
#: storage/src/modules/StorageFields.ycp:127
msgid "Type"
msgstr ""
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
