Hello community,
here is the log from the commit of package yast2-storage for openSUSE:Factory
checked in at Mon Mar 1 01:52:09 CET 2010.
--------
--- yast2-storage/yast2-storage.changes 2010-02-11 20:57:50.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2010-02-26 15:24:36.000000000 +0100
@@ -1,0 +2,26 @@
+Fri Feb 26 15:02:54 CET 2010 - aschnell@suse.de
+
+- mark messages for translation (bnc #580855)
+- 2.19.7
+
+-------------------------------------------------------------------
+Thu Feb 25 13:00:45 CET 2010 - aschnell@suse.de
+
+- fixed proposal workflow on S390 (bnc #583119)
+
+-------------------------------------------------------------------
+Wed Feb 24 17:37:45 CET 2010 - aschnell@suse.de
+
+- check availability of smartctl and hdparm (bnc #580905)
+
+-------------------------------------------------------------------
+Wed Feb 24 10:33:34 CET 2010 - aschnell@suse.de
+
+- mark messages for translation (bnc #580871 and bnc #581298)
+
+-------------------------------------------------------------------
+Tue Feb 16 16:31:17 CET 2010 - aschnell@suse.de
+
+- don't import mount point for installation source (bnc #577560)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-storage-2.19.6.tar.bz2
New:
----
yast2-storage-2.19.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.7Z9B3C/_old 2010-03-01 01:52:02.000000000 +0100
+++ /var/tmp/diff_new_pack.7Z9B3C/_new 2010-03-01 01:52:02.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.19.6)
+# spec file for package yast2-storage (Version 2.19.7)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,16 +19,19 @@
Name: yast2-storage
-Version: 2.19.6
+Version: 2.19.7
Release: 1
+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.19.6.tar.bz2
+Source0: yast2-storage-2.19.7.tar.bz2
+
Prefix: /usr
+
Group: System/YaST
License: GPLv2+
BuildRequires: blocxx-devel boost-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files
-BuildRequires: libstorage-devel >= 2.19.9 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools
+BuildRequires: libstorage-devel >= 2.19.10 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools
BuildRequires: yast2-perl-bindings yast2-testsuite >= 2.19.0
Requires: libstorage = %(echo `rpm -q --queryformat '%{VERSION}' libstorage`)
Requires: yast2-perl-bindings yast2-core >= 2.18.3 yast2 >= 2.19.4 yast2-libyui >= 2.18.7
@@ -52,14 +55,16 @@
devices during installation and on an installed system.
%prep
-%setup -n yast2-storage-2.19.6
+%setup -n yast2-storage-2.19.7
%build
%{prefix}/bin/y2tool y2autoconf
%{prefix}/bin/y2tool y2automake
autoreconf --force --install
+
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)
@@ -73,6 +78,7 @@
d=${f##*/}
%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
done
+
rm -f $RPM_BUILD_ROOT/%{_libdir}/YaST2/plugin/libpy2StorageCallbacks.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/YaST2/plugin/libpy2StorageCallbacks.so
@@ -84,6 +90,7 @@
%files
%defattr(-,root,root)
+
# storage
%dir /usr/share/YaST2/include/partitioning
/usr/share/YaST2/include/partitioning/*.ycp
@@ -103,20 +110,27 @@
/usr/share/YaST2/clients/multipath-simple.ycp
/usr/share/YaST2/modules/*
/var/adm/fillup-templates/sysconfig.storage-yast2-storage
+
%dir /usr/share/YaST2/data
/usr/share/YaST2/data/*.ycp
+
%doc %dir %{prefix}/share/doc/packages/yast2-storage
%doc %{prefix}/share/doc/packages/yast2-storage/README*
%doc %{prefix}/share/doc/packages/yast2-storage/COPY*
+
# agents-scr
/usr/share/YaST2/scrconf/*.scr
+
# libstorage ycp callbacks
%{_libdir}/YaST2/plugin/libpy2StorageCallbacks.so.*
+
# disk
%dir %{prefix}/share/applications/YaST2
%{prefix}/share/applications/YaST2/disk.desktop
+
# scripts
%{prefix}/lib/YaST2/bin/check.boot
+
# perl bindings of libstorage
%{perl_vendorarch}/LibStorage.so
++++++ yast2-storage-2.19.6.tar.bz2 -> yast2-storage-2.19.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.6/VERSION new/yast2-storage-2.19.7/VERSION
--- old/yast2-storage-2.19.6/VERSION 2010-02-10 12:18:38.000000000 +0100
+++ new/yast2-storage-2.19.7/VERSION 2010-02-26 15:14:41.000000000 +0100
@@ -1 +1 @@
-2.19.6
+2.19.7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.6/configure new/yast2-storage-2.19.7/configure
--- old/yast2-storage-2.19.6/configure 2010-01-26 11:57:33.000000000 +0100
+++ new/yast2-storage-2.19.7/configure 2010-02-26 15:14:53.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-storage 2.19.4.
+# Generated by GNU Autoconf 2.63 for yast2-storage 2.19.7.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -745,8 +745,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-storage'
PACKAGE_TARNAME='yast2-storage'
-PACKAGE_VERSION='2.19.4'
-PACKAGE_STRING='yast2-storage 2.19.4'
+PACKAGE_VERSION='2.19.7'
+PACKAGE_STRING='yast2-storage 2.19.7'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1537,7 +1537,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.19.4 to adapt to many kinds of systems.
+\`configure' configures yast2-storage 2.19.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1608,7 +1608,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-storage 2.19.4:";;
+ short | recursive ) echo "Configuration of yast2-storage 2.19.7:";;
esac
cat <<\_ACEOF
@@ -1720,7 +1720,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-storage configure 2.19.4
+yast2-storage configure 2.19.7
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1734,7 +1734,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.19.4, which was
+It was created by yast2-storage $as_me 2.19.7, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2714,7 +2714,7 @@
# Define the identity of the package.
PACKAGE='yast2-storage'
- VERSION='2.19.4'
+ VERSION='2.19.7'
cat >>confdefs.h <<_ACEOF
@@ -2836,7 +2836,7 @@
-VERSION="2.19.4"
+VERSION="2.19.7"
RPMNAME="yast2-storage"
MAINTAINER="Arvin Schnell "
@@ -17373,7 +17373,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.19.4, which was
+This file was extended by yast2-storage $as_me 2.19.7, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17436,7 +17436,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-storage config.status 2.19.4
+yast2-storage config.status 2.19.7
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.6/configure.in new/yast2-storage-2.19.7/configure.in
--- old/yast2-storage-2.19.6/configure.in 2010-01-26 11:57:16.000000000 +0100
+++ new/yast2-storage-2.19.7/configure.in 2010-02-26 15:14:44.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-storage, 2.19.4, http://bugs.opensuse.org/, yast2-storage)
+AC_INIT(yast2-storage, 2.19.7, 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.19.4"
+VERSION="2.19.7"
RPMNAME="yast2-storage"
MAINTAINER="Arvin Schnell "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.6/storage/src/include/custom_part_lib.ycp new/yast2-storage-2.19.7/storage/src/include/custom_part_lib.ycp
--- old/yast2-storage-2.19.6/storage/src/include/custom_part_lib.ycp 2010-01-12 16:55:41.000000000 +0100
+++ new/yast2-storage-2.19.7/storage/src/include/custom_part_lib.ycp 2010-02-17 18:18:05.000000000 +0100
@@ -13,7 +13,7 @@
*
*************************************************************
*
- $Id: custom_part_lib.ycp 60337 2010-01-12 15:55:40Z fehr $
+ $Id: custom_part_lib.ycp 60827 2010-02-16 15:32:38Z aschnell $
*
*/
@@ -996,12 +996,12 @@
* @return return ( [ targetMap, table_input ]
*
*/
-define list AddFstabToData( map targetMap, list<map> fstab )
- ``{
+list AddFstabToData(map targetMap, list<map> fstab)
+{
if( fstab == nil )
- return [targetMap] ;
+ return [ targetMap ];
- y2milestone( "AddFstabToData fstab = %1", fstab );
+ y2milestone( "AddFstabToData fstab:%1", fstab );
map new_targetMap = targetMap;
map table_input = $["tbl":[]];
@@ -1018,16 +1018,12 @@
``{
string dev_fstab = fstab_entry["device"]:"";
string mount_fstab = fstab_entry["mount"]:"";
- boolean found = false;
- if( dev_fstab == partition["device"]:"" )
- {
- found = true;
- }
- if( found )
- {
+ if (dev_fstab == partition["device"]:"" &&
+ !Storage::IsInstallationSource(partition["device"]:""))
+ {
new_partition["mount"] = mount_fstab;
- if( size(fstab_entry["fstopt"]:"")>0 &&
+ if( !isempty(fstab_entry["fstopt"]:"") &&
fstab_entry["fstopt"]:"" != "default" )
{
new_partition["fstopt"] = fstab_entry["fstopt"]:"";
@@ -1055,18 +1051,18 @@
new_targetMap[dev] = target;
});
- y2milestone( "AddFstabToData table_input %1", table_input );
- y2milestone( "AddFstabToData tbl %1", table_input["tbl"]:[] );
+ y2milestone( "AddFstabToData table_input:%1", table_input );
+ y2milestone( "AddFstabToData tbl:%1", table_input["tbl"]:[] );
if( size( table_input["tbl"]:[] )>1 )
{
table_input["tbl"] = sort( term a, term b, table_input["tbl"]:[],
``(a[2]:"" 0)
+ // push button text (do not translate 'SMART', it is the name of the tool)
+ buttons = add(buttons, `PushButton(`id(`smart), _("Health Test (SMART)...")));
+
+ if ((integer) SCR::Read(.target.size, "/sbin/hdparm") > 0)
+ // push button text (do not translate 'hdparm', it is the name of the tool)
+ buttons = add(buttons, `PushButton(`id(`hdparm), _("Properties (hdparm)...")));
+
UI::ReplaceWidget(`tab_panel,
`VBox(
`HStretch(),
StorageFields::Overview(StorageSettings::FilterOverview(fields), target_map, device),
- `HBox(
- // push button text (do not translate 'SMART', it is the name of the tool)
- `PushButton(`id(`smart), _("Health Test (SMART)...")),
- // push button text (do not translate 'hdparm', it is the name of the tool)
- `PushButton(`id(`hdparm), _("Properties (hdparm)...")),
- `HStretch()
- )
+ add(buttons, `HStretch())
)
);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.6/storage/src/include/ep-lvm-dialogs.ycp new/yast2-storage-2.19.7/storage/src/include/ep-lvm-dialogs.ycp
--- old/yast2-storage-2.19.6/storage/src/include/ep-lvm-dialogs.ycp 2009-11-24 16:01:00.000000000 +0100
+++ new/yast2-storage-2.19.7/storage/src/include/ep-lvm-dialogs.ycp 2010-02-26 15:12:13.000000000 +0100
@@ -214,7 +214,7 @@
});
// label for input field
- contents = add(contents, `Left(`InputField(`id(`vgname), "Volume Group Name")));
+ contents = add(contents, `Left(`InputField(`id(`vgname), _("Volume Group Name"))));
contents = add(contents, `Left(`ComboBoxSelected(`id(`pesize), `opt(`editable),
// label for combo box
_("&Physical Extent Size"), pesizes_list, `id(pesize))));
@@ -279,7 +279,7 @@
string MiniWorkflowStepResizeVgHelptext()
{
// helptext
- string helptext = "<p>Change the devices that are used for the volume group.</p>";
+ string helptext = _("<p>Change the devices that are used for the volume group.</p>");
return helptext;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.6/storage/src/modules/Storage.ycp new/yast2-storage-2.19.7/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.19.6/storage/src/modules/Storage.ycp 2010-02-10 12:21:04.000000000 +0100
+++ new/yast2-storage-2.19.7/storage/src/modules/Storage.ycp 2010-02-17 18:18:05.000000000 +0100
@@ -19,7 +19,7 @@
* wurde versucht "intelligent" zu gestallten und ist im einzelen bei den
* entspechenden Funktionen n�her erkl�rt.
*
- * $Id: Storage.ycp 60782 2010-02-10 11:21:03Z fehr $
+ * $Id: Storage.ycp 60827 2010-02-16 15:32:38Z aschnell $
*/
{
module "Storage";
@@ -2045,6 +2045,12 @@
}
+ global boolean IsInstallationSource(string device)
+ {
+ return !isempty(device) && device == part_insts;
+ }
+
+
/* Dev definitions
dev = maindev | subdev
@@ -3694,7 +3700,7 @@
Popup::Message( txt );
}
}
- if( size(part_insts)>0 && p["device"]:""==part_insts )
+ if (IsInstallationSource(p["device"]:""))
{
ret = false;
y2milestone( "CanEdit part_insts:%1 p:%2", part_insts, p );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.6/storage/src/proposal/partitions_proposal.ycp new/yast2-storage-2.19.7/storage/src/proposal/partitions_proposal.ycp
--- old/yast2-storage-2.19.6/storage/src/proposal/partitions_proposal.ycp 2009-11-05 11:03:34.000000000 +0100
+++ new/yast2-storage-2.19.7/storage/src/proposal/partitions_proposal.ycp 2010-02-26 15:12:13.000000000 +0100
@@ -1,7 +1,7 @@
/**
* Module: proposal_partitions.ycp
*
- * $Id: partitions_proposal.ycp 59267 2009-11-02 10:58:59Z jsrain $
+ * $Id: partitions_proposal.ycp 61023 2010-02-25 12:04:23Z aschnell $
*
* Author: Klaus Kaempf
*
@@ -145,12 +145,7 @@
seq["disk"] = $[ `abort : `abort, `cancel: `cancel, `next: `next ];
- if( Arch::s390() )
- {
- Storage::SetPartMode("PROP_MODIFY");
- seq["ws_start"] = "disk";
- }
- else if( Mode::autoinst() )
+ if( Mode::autoinst() )
{
Storage::SetPartMode("PROP_MODIFY");
seq["ws_start"] = "disk";
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org