Hello community,
here is the log from the commit of package yast2-storage
checked in at Thu Mar 15 19:12:00 CET 2007.
--------
--- yast2-storage/yast2-storage.changes 2007-02-26 16:27:14.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2007-03-15 18:43:26.000000000 +0100
@@ -1,0 +2,40 @@
+Thu Mar 15 13:15:04 CET 2007 - fehr@suse.de
+
+- fix sort order for deleted partition with same number (#254599)
+- prevent removal of to-be-created logical partitions if extended
+ partition gets removed (#254599)
+- version 2.15.6
+
+-------------------------------------------------------------------
+Wed Mar 14 13:09:55 CET 2007 - fehr@suse.de
+
+- add needed changes for bug #249764
+
+-------------------------------------------------------------------
+Tue Mar 13 09:55:09 CET 2007 - fehr@suse.de
+
+- add changes done by Lukas Ocilka for UI speedup to disk
+ client (#253943)
+- add missing dependencies to Requires line (#253969)
+
+-------------------------------------------------------------------
+Mon Mar 12 13:22:30 CET 2007 - fehr@suse.de
+
+- treat partition id 0x6 like 0x41 on arch ppc (#247739)
+
+-------------------------------------------------------------------
+Mon Mar 5 14:05:40 CET 2007 - fehr@suse.de
+
+- be more verbose with output of hwinfo --map
+
+-------------------------------------------------------------------
+Wed Feb 28 15:56:30 CET 2007 - fehr@suse.de
+
+- fix problems with inconsistent display of EVMS PVs (#245729)
+
+-------------------------------------------------------------------
+Tue Feb 27 18:22:53 CET 2007 - fehr@suse.de
+
+- reset label when proposal formats a partition (#249380)
+
+-------------------------------------------------------------------
@@ -4 +44 @@
-- only allow crypt password from /dev/randowm when persistent
+- only allow crypt password from /dev/random when persistent
Old:
----
yast2-storage-2.15.5.tar.bz2
New:
----
yast2-storage-2.15.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.EyE456/_old 2007-03-15 19:11:12.000000000 +0100
+++ /var/tmp/diff_new_pack.EyE456/_new 2007-03-15 19:11:12.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.15.5)
+# spec file for package yast2-storage (Version 2.15.6)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,15 +11,17 @@
# norootforbuild
Name: yast2-storage
-Version: 2.15.5
+Version: 2.15.6
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.15.5.tar.bz2
+Source0: yast2-storage-2.15.6.tar.bz2
prefix: /usr
BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen evms gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite
-Requires: yast2 parted yast2-installation yast2-storage-lib yast2-perl-bindings
+# Required only in inst-sys
+# Requires: yast2-update
+Requires: yast2 parted yast2-installation yast2-storage-lib yast2-perl-bindings autoyast2-installation
%ifarch s390 s390x
Requires: yast2-s390
%endif
@@ -40,7 +42,7 @@
%prep
-%setup -n yast2-storage-2.15.5
+%setup -n yast2-storage-2.15.6
%build
%{prefix}/bin/y2tool y2autoconf
@@ -85,6 +87,7 @@
/usr/share/YaST2/clients/partitions_proposal.ycp
/usr/share/YaST2/clients/controller.ycp
/usr/share/YaST2/clients/disk.ycp
+/usr/share/YaST2/clients/disk_worker.ycp
/usr/share/YaST2/clients/lvm_config.ycp
/usr/share/YaST2/clients/lvm_config_ui.ycp
/usr/share/YaST2/clients/create_udev_cdrom.ycp
@@ -165,8 +168,27 @@
%doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description
%changelog
+* Thu Mar 15 2007 - fehr@suse.de
+- fix sort order for deleted partition with same number (#254599)
+- prevent removal of to-be-created logical partitions if extended
+ partition gets removed (#254599)
+- version 2.15.6
+* Wed Mar 14 2007 - fehr@suse.de
+- add needed changes for bug #249764
+* Tue Mar 13 2007 - fehr@suse.de
+- add changes done by Lukas Ocilka for UI speedup to disk
+ client (#253943)
+- add missing dependencies to Requires line (#253969)
+* Mon Mar 12 2007 - fehr@suse.de
+- treat partition id 0x6 like 0x41 on arch ppc (#247739)
+* Mon Mar 05 2007 - fehr@suse.de
+- be more verbose with output of hwinfo --map
+* Wed Feb 28 2007 - fehr@suse.de
+- fix problems with inconsistent display of EVMS PVs (#245729)
+* Tue Feb 27 2007 - fehr@suse.de
+- reset label when proposal formats a partition (#249380)
* Thu Feb 22 2007 - fehr@suse.de
-- only allow crypt password from /dev/randowm when persistent
+- only allow crypt password from /dev/random when persistent
devices names are available
- fix problems caused by activated EVMS during update (#247801)
- version 2.15.5
++++++ yast2-storage-2.15.5.tar.bz2 -> yast2-storage-2.15.6.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.5/aclocal.m4 new/yast2-storage-2.15.6/aclocal.m4
--- old/yast2-storage-2.15.5/aclocal.m4 2006-10-12 12:30:43.000000000 +0200
+++ new/yast2-storage-2.15.6/aclocal.m4 2007-03-13 09:53:21.000000000 +0100
@@ -7275,7 +7275,7 @@
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
fi
if test -n "$PKG_CONFIG"; then
- _pkg_min_version=m4_ifval([$1], [$1], [0.9.0])
+ _pkg_min_version=m4_default([$1], [0.9.0])
AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
AC_MSG_RESULT([yes])
@@ -7287,29 +7287,61 @@
fi[]dnl
])# PKG_PROG_PKG_CONFIG
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists. Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+#
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+ m4_ifval([$2], [$2], [:])
+m4_ifvaln([$3], [else
+ $3])dnl
+fi])
+
+
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
-[if test "x$ac_cv_env_[]$1[]_set" = "xset"; then
- pkg_cv_[]$1=$ac_cv_env_[]$1[]_value
-elif test -n "$PKG_CONFIG"; then
- if AC_RUN_LOG([$PKG_CONFIG --exists "$3" >/dev/null 2>&1]); then
- pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
- else
- pkg_failed=yes
- fi
+[if test -n "$PKG_CONFIG"; then
+ if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ else
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
+ fi
else
pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
# [ACTION-IF-NOT-FOUND])
#
#
# Note that if there is a possibility the first call to
# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.in
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
#
#
# --------------------------------------------------------------
@@ -7319,24 +7351,35 @@
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
pkg_failed=no
-AC_CACHE_CHECK([for $1][_CFLAGS], [pkg_cv_][$1][_CFLAGS],
- [_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])])
-AC_CACHE_CHECK([for $1][_LIBS], [pkg_cv_][$1][_LIBS],
- [_PKG_CONFIG([$1][_LIBS], [libs], [$2])])
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+ else
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+ fi
# Put the nasty error message in config.log where it belongs
- echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
ifelse([$4], , [AC_MSG_ERROR(dnl
-[Package requirements ($2) were not met.
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
-to avoid the need to call pkg-config. See the pkg-config man page for
-more details.])],
+_PKG_TEXT
+])],
[$4])
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
@@ -7344,15 +7387,14 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
-to avoid the need to call pkg-config. See the pkg-config man page for
-more details.
+_PKG_TEXT
To get pkg-config, see http://www.freedesktop.org/software/pkgconfig.])],
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
ifelse([$3], , :, [$3])
fi[]dnl
])# PKG_CHECK_MODULES
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.5/configure new/yast2-storage-2.15.6/configure
--- old/yast2-storage-2.15.5/configure 2006-10-12 12:30:47.000000000 +0200
+++ new/yast2-storage-2.15.6/configure 2007-03-13 09:53:25.000000000 +0100
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-storage 2.14.9.
+# Generated by GNU Autoconf 2.59 for yast2-storage 2.15.5.
#
-# Report bugs to http://www.suse.de/feedback.
+# Report bugs to http://bugs.opensuse.org/.
#
# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
@@ -423,9 +423,9 @@
# Identity of this package.
PACKAGE_NAME='yast2-storage'
PACKAGE_TARNAME='yast2-storage'
-PACKAGE_VERSION='2.14.9'
-PACKAGE_STRING='yast2-storage 2.14.9'
-PACKAGE_BUGREPORT='http://www.suse.de/feedback'
+PACKAGE_VERSION='2.15.5'
+PACKAGE_STRING='yast2-storage 2.15.5'
+PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
ac_default_prefix=/usr
@@ -971,7 +971,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.14.9 to adapt to many kinds of systems.
+\`configure' configures yast2-storage 2.15.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1038,7 +1038,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-storage 2.14.9:";;
+ short | recursive ) echo "Configuration of yast2-storage 2.15.5:";;
esac
cat <<\_ACEOF
@@ -1089,7 +1089,7 @@
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-Report bugs to http://www.suse.de/feedback.
+Report bugs to http://bugs.opensuse.org/.
_ACEOF
fi
@@ -1185,7 +1185,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-storage configure 2.14.9
+yast2-storage configure 2.15.5
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1199,7 +1199,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.14.9, which was
+It was created by yast2-storage $as_me 2.15.5, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1929,7 +1929,7 @@
# Define the identity of the package.
PACKAGE='yast2-storage'
- VERSION='2.14.9'
+ VERSION='2.15.5'
cat >>confdefs.h <<_ACEOF
@@ -2140,7 +2140,7 @@
-VERSION="2.14.9"
+VERSION="2.15.5"
RPMNAME="yast2-storage"
MAINTAINER="Thomas Fehr "
@@ -5568,9 +5568,9 @@
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to http://www.suse.de/feedback ##
-## ------------------------------------------ ##
+## ---------------------------------------- ##
+## Report this to http://bugs.opensuse.org/ ##
+## ---------------------------------------- ##
_ASBOX
) |
sed "s/^/$as_me: WARNING: /" >&2
@@ -19803,81 +19803,94 @@
fi
pkg_failed=no
-echo "$as_me:$LINENO: checking for Y2UTIL_CFLAGS" >&5
-echo $ECHO_N "checking for Y2UTIL_CFLAGS... $ECHO_C" >&6
-if test "${pkg_cv_Y2UTIL_CFLAGS+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "x$ac_cv_env_Y2UTIL_CFLAGS_set" = "xset"; then
- pkg_cv_Y2UTIL_CFLAGS=$ac_cv_env_Y2UTIL_CFLAGS_value
-elif test -n "$PKG_CONFIG"; then
- if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"liby2util\" >/dev/null 2>&1") >&5
- ($PKG_CONFIG --exists "liby2util" >/dev/null 2>&1) 2>&5
+echo "$as_me:$LINENO: checking for Y2UTIL" >&5
+echo $ECHO_N "checking for Y2UTIL... $ECHO_C" >&6
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$Y2UTIL_CFLAGS"; then
+ pkg_cv_Y2UTIL_CFLAGS="$Y2UTIL_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liby2util\"") >&5
+ ($PKG_CONFIG --exists --print-errors "liby2util") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_Y2UTIL_CFLAGS=`$PKG_CONFIG --cflags "liby2util" 2>/dev/null`
- else
- pkg_failed=yes
- fi
+ pkg_cv_Y2UTIL_CFLAGS=`$PKG_CONFIG --cflags "liby2util" 2>/dev/null`
else
- pkg_failed=untried
-fi
+ pkg_failed=yes
fi
-echo "$as_me:$LINENO: result: $pkg_cv_Y2UTIL_CFLAGS" >&5
-echo "${ECHO_T}$pkg_cv_Y2UTIL_CFLAGS" >&6
-echo "$as_me:$LINENO: checking for Y2UTIL_LIBS" >&5
-echo $ECHO_N "checking for Y2UTIL_LIBS... $ECHO_C" >&6
-if test "${pkg_cv_Y2UTIL_LIBS+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
else
- if test "x$ac_cv_env_Y2UTIL_LIBS_set" = "xset"; then
- pkg_cv_Y2UTIL_LIBS=$ac_cv_env_Y2UTIL_LIBS_value
-elif test -n "$PKG_CONFIG"; then
- if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"liby2util\" >/dev/null 2>&1") >&5
- ($PKG_CONFIG --exists "liby2util" >/dev/null 2>&1) 2>&5
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$Y2UTIL_LIBS"; then
+ pkg_cv_Y2UTIL_LIBS="$Y2UTIL_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liby2util\"") >&5
+ ($PKG_CONFIG --exists --print-errors "liby2util") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_Y2UTIL_LIBS=`$PKG_CONFIG --libs "liby2util" 2>/dev/null`
- else
- pkg_failed=yes
- fi
+ pkg_cv_Y2UTIL_LIBS=`$PKG_CONFIG --libs "liby2util" 2>/dev/null`
else
- pkg_failed=untried
+ pkg_failed=yes
fi
+ fi
+else
+ pkg_failed=untried
fi
-echo "$as_me:$LINENO: result: $pkg_cv_Y2UTIL_LIBS" >&5
-echo "${ECHO_T}$pkg_cv_Y2UTIL_LIBS" >&6
+
+
if test $pkg_failed = yes; then
- Y2UTIL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "liby2util"`
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ Y2UTIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "liby2util"`
+ else
+ Y2UTIL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "liby2util"`
+ fi
# Put the nasty error message in config.log where it belongs
- echo "$Y2UTIL_PKG_ERRORS" 1>&5
+ echo "$Y2UTIL_PKG_ERRORS" >&5
+
+ { { echo "$as_me:$LINENO: error: Package requirements (liby2util) were not met:
+
+$Y2UTIL_PKG_ERRORS
- { { echo "$as_me:$LINENO: error: Package requirements (liby2util) were not met.
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-Alternatively you may set the Y2UTIL_CFLAGS and Y2UTIL_LIBS environment variables
-to avoid the need to call pkg-config. See the pkg-config man page for
-more details." >&5
-echo "$as_me: error: Package requirements (liby2util) were not met.
+Alternatively, you may set the environment variables Y2UTIL_CFLAGS
+and Y2UTIL_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+echo "$as_me: error: Package requirements (liby2util) were not met:
+
+$Y2UTIL_PKG_ERRORS
+
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-Alternatively you may set the Y2UTIL_CFLAGS and Y2UTIL_LIBS environment variables
-to avoid the need to call pkg-config. See the pkg-config man page for
-more details." >&2;}
+Alternatively, you may set the environment variables Y2UTIL_CFLAGS
+and Y2UTIL_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-Alternatively you may set the Y2UTIL_CFLAGS and Y2UTIL_LIBS environment variables
-to avoid the need to call pkg-config. See the pkg-config man page for
-more details.
+Alternatively, you may set the environment variables Y2UTIL_CFLAGS
+and Y2UTIL_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
To get pkg-config, see http://www.freedesktop.org/software/pkgconfig.
See \`config.log' for more details." >&5
@@ -19885,9 +19898,9 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-Alternatively you may set the Y2UTIL_CFLAGS and Y2UTIL_LIBS environment variables
-to avoid the need to call pkg-config. See the pkg-config man page for
-more details.
+Alternatively, you may set the environment variables Y2UTIL_CFLAGS
+and Y2UTIL_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
To get pkg-config, see http://www.freedesktop.org/software/pkgconfig.
See \`config.log' for more details." >&2;}
@@ -19895,6 +19908,8 @@
else
Y2UTIL_CFLAGS=$pkg_cv_Y2UTIL_CFLAGS
Y2UTIL_LIBS=$pkg_cv_Y2UTIL_LIBS
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
:
fi
@@ -20314,7 +20329,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-storage $as_me 2.14.9, which was
+This file was extended by yast2-storage $as_me 2.15.5, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20377,7 +20392,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-storage config.status 2.14.9
+yast2-storage config.status 2.15.5
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.5/configure.in new/yast2-storage-2.15.6/configure.in
--- old/yast2-storage-2.15.5/configure.in 2006-10-12 12:30:30.000000000 +0200
+++ new/yast2-storage-2.15.6/configure.in 2007-03-13 09:53:08.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-storage
dnl
-dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-storage, 2.14.9, http://www.suse.de/feedback, yast2-storage)
+AC_INIT(yast2-storage, 2.15.5, http://bugs.opensuse.org/, yast2-storage)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.14.9"
+VERSION="2.15.5"
RPMNAME="yast2-storage"
MAINTAINER="Thomas Fehr "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.5/disk/src/disk_worker.ycp new/yast2-storage-2.15.6/disk/src/disk_worker.ycp
--- old/yast2-storage-2.15.5/disk/src/disk_worker.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.15.6/disk/src/disk_worker.ycp 2007-03-13 08:28:47.000000000 +0100
@@ -0,0 +1,55 @@
+/**
+ * File:
+ * disk_worker.ycp
+ *
+ * Module:
+ * Configuration of disk
+ *
+ * Summary:
+ * Main file
+ *
+ * Authors:
+ * Michael Hager
+ *
+ * $Id: disk.ycp 36352 2007-02-21 15:53:38Z fehr $
+ *
+ * Wrapper file for inst_disk.ycp
+ *
+ */
+
+{
+
+/***
+ * <h3>Configuration of the disk</h3>
+ */
+
+ textdomain "storage";
+
+ import "CommandLine";
+ import "StorageClients";
+ import "Popup";
+ import "Storage";
+
+define any DiskSequence () {
+ Storage::SwitchUiAutomounter( false );
+ any ret = WFM::CallFunction("inst_disk", [ true, true ]);
+ Storage::SwitchUiAutomounter( true );
+ Storage::SaveUsedFs();
+
+ return ret;
+}
+
+/* -- the command line description map -------------------------------------- */
+map cmdline = $[
+ "id" : "disk",
+ // translators: command line help text for disk module
+ "help" : _("Disk partitioner"),
+ // custum help text (should replace default one)
+ "customhelp" : _("Command line interface for the partitioner module is not available"),
+ "guihandler" : DiskSequence,
+];
+
+CommandLine::Run (cmdline);
+return true;
+
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.5/disk/src/disk.ycp new/yast2-storage-2.15.6/disk/src/disk.ycp
--- old/yast2-storage-2.15.5/disk/src/disk.ycp 2007-02-21 16:53:41.000000000 +0100
+++ new/yast2-storage-2.15.6/disk/src/disk.ycp 2007-03-13 09:58:22.000000000 +0100
@@ -11,7 +11,7 @@
* Authors:
* Michael Hager
*
- * $Id: disk.ycp 36352 2007-02-21 15:53:38Z fehr $
+ * $Id: disk.ycp 36906 2007-03-13 08:58:19Z fehr $
*
* Wrapper file for inst_disk.ycp
*
@@ -23,14 +23,10 @@
* <h3>Configuration of the disk</h3>
*/
- textdomain "storage";
+ textdomain "storage";
- import "CommandLine";
- import "StorageClients";
- import "Popup";
- import "Storage";
-
-define any DiskSequence () {
+ import "Popup";
+ import "Wizard";
string msg=_("Only use this program if you are familiar with partitioning hard disks.
@@ -42,29 +38,36 @@
To continue despite this warning, click Yes.
");
- any ret = `back;
- // popup headline
- if (Popup::YesNoHeadline(_("Warning"),msg)==true)
- {
- Storage::SwitchUiAutomounter( false );
- ret = WFM::CallFunction("inst_disk", [ true, true ]);
- Storage::SwitchUiAutomounter( true );
- Storage::SaveUsedFs();
- }
- return ret;
-}
+ any ret = `back;
-/* -- the command line description map -------------------------------------- */
-map cmdline = $[
- "id" : "disk",
- // translators: command line help text for disk module
- "help" : _("Disk partitioner"),
- // custum help text (should replace default one)
- "customhelp" : _("Command line interface for the partitioner module is not available"),
- "guihandler" : DiskSequence,
-];
-
-CommandLine::Run (cmdline);
-return true;
+ // no params == UI, some params == commandline
+ if (size (WFM::Args()) == 0) {
+ Wizard::CreateDialog();
+ Wizard::SetContents (
+ _("Expert Partitioner"),
+ `Label (_("Initializing...")),
+ _("<p>Please wait, while the storage is being initialized.</p>"),
+ false,
+ false
+ );
+ Wizard::SetTitleIcon ("yast-disk");
+
+ ret = `back;
+ // popup headline
+ if (Popup::YesNoHeadline(_("Warning"),msg)==true) {
+ y2milestone ("--- Calling disk_worker %1 ---", WFM::Args());
+ ret = WFM::call("disk_worker", WFM::Args());
+ y2milestone ("--- Returned: %1 ---", ret);
+ } else {
+ y2milestone ("User decided not to run storage...");
+ }
+
+ Wizard::CloseDialog();
+ } else {
+ y2milestone ("--- Calling disk_worker %1 ---", WFM::Args());
+ ret = WFM::call("disk_worker", WFM::Args());
+ y2milestone ("--- Returned: %1 ---", ret);
+ }
+ return true;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.5/disk/src/Makefile.am new/yast2-storage-2.15.6/disk/src/Makefile.am
--- old/yast2-storage-2.15.5/disk/src/Makefile.am 2005-01-24 14:50:47.000000000 +0100
+++ new/yast2-storage-2.15.6/disk/src/Makefile.am 2007-03-13 09:58:22.000000000 +0100
@@ -1,11 +1,12 @@
#
# Makefile.am for storage/disk/src
#
-# $Id: Makefile.am 13961 2004-02-07 19:35:45Z arvin $
+# $Id: Makefile.am 36906 2007-03-13 08:58:19Z fehr $
#
client_DATA = \
- disk.ycp
+ disk.ycp \
+ disk_worker.ycp
desktop_DATA = disk.desktop
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.5/disk/src/Makefile.in new/yast2-storage-2.15.6/disk/src/Makefile.in
--- old/yast2-storage-2.15.5/disk/src/Makefile.in 2006-10-12 12:30:54.000000000 +0200
+++ new/yast2-storage-2.15.6/disk/src/Makefile.in 2007-03-13 11:11:55.000000000 +0100
@@ -17,7 +17,7 @@
#
# Makefile.am for storage/disk/src
#
-# $Id: Makefile.am 13961 2004-02-07 19:35:45Z arvin $
+# $Id: Makefile.am 36906 2007-03-13 08:58:19Z fehr $
#
srcdir = @srcdir@
@@ -215,7 +215,8 @@
yncludedir = @yncludedir@
ystartupdir = @ystartupdir@
client_DATA = \
- disk.ycp
+ disk.ycp \
+ disk_worker.ycp
desktop_DATA = disk.desktop
EXTRA_DIST = $(client_DATA) $(desktop_DATA)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.5/libstorage/src/Disk.cc new/yast2-storage-2.15.6/libstorage/src/Disk.cc
--- old/yast2-storage-2.15.5/libstorage/src/Disk.cc 2007-02-20 12:10:54.000000000 +0100
+++ new/yast2-storage-2.15.6/libstorage/src/Disk.cc 2007-03-15 13:18:09.000000000 +0100
@@ -170,6 +170,16 @@
y2debug( "destructed disk %s", dev.c_str() );
}
+void Disk::triggerUdevUpdate()
+ {
+ PartPair pp = partPair();
+ for( PartIter p=pp.begin(); p!=pp.end(); ++p )
+ {
+ if( !p->deleted() && !p->created() )
+ p->triggerUdevUpdate();
+ }
+ }
+
void Disk::setUdevData( const string& path, const string& id )
{
y2milestone( "disk %s path %s id %s", nm.c_str(), path.c_str(), id.c_str() );
@@ -1491,8 +1501,7 @@
if( ret==0 )
{
PartitionType t = i->type();
- bool creat = i->created();
- if( creat )
+ if( i->created() )
{
if( !removeFromList( &(*i) ))
ret = DISK_REMOVE_PARTITION_CREATE_NOT_FOUND;
@@ -1538,7 +1547,7 @@
{
if( i->nr()>max_primary )
{
- if( creat )
+ if( i->created() )
l.push_back( &(*i) );
else
i->setDeleted();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.5/libstorage/src/Disk.h new/yast2-storage-2.15.6/libstorage/src/Disk.h
--- old/yast2-storage-2.15.5/libstorage/src/Disk.h 2007-01-31 20:49:00.000000000 +0100
+++ new/yast2-storage-2.15.6/libstorage/src/Disk.h 2007-03-14 13:14:42.000000000 +0100
@@ -57,6 +57,7 @@
bool detect( ProcPart& ppart );
static storage::CType const staticType() { return storage::DISK; }
friend std::ostream& operator<< (std::ostream&, const Disk& );
+ void triggerUdevUpdate();
static bool needP( const string& dev );
void setUdevData( const string& path, const string& id );
@@ -188,7 +189,7 @@
void removeFromMemory();
static bool notDeleted( const Partition&d ) { return( !d.deleted() ); }
- static bool bootSpecial( const Partition&d ) { return( !d.deleted()&&d.id()==0x41 ); }
+ static bool bootSpecial( const Partition&d ) { return( !d.deleted()&&(d.id()==0x41||d.id()==0x06) ); }
virtual int doCreate( Volume* v );
virtual int doRemove( Volume* v );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.5/libstorage/src/EvmsCo.cc new/yast2-storage-2.15.6/libstorage/src/EvmsCo.cc
--- old/yast2-storage-2.15.5/libstorage/src/EvmsCo.cc 2007-02-19 17:34:19.000000000 +0100
+++ new/yast2-storage-2.15.6/libstorage/src/EvmsCo.cc 2007-02-28 16:02:40.000000000 +0100
@@ -1724,6 +1724,30 @@
return( ret );
}
+void EvmsCo::changeDeviceName( const string& old, const string& nw )
+ {
+ PeContainer::changeDeviceName( old, nw );
+ if( !container )
+ {
+ string nm = devToEvms(undevDevice(old));
+ y2mil( "old:" << old << " new:" << nw << " nm:" << nm );
+ EvmsPair ep = evmsPair(lvNotDeleted);
+ EvmsIter i = ep.begin();
+ while( i!=ep.end() && i->name()!=nm )
+ ++i;
+ if( i!=ep.end() )
+ {
+ y2mil( "ev:" << *i );
+ string n = devToEvms(undevDevice(nw));
+ y2mil( "new:" << n );
+ i->rename( n );
+ i->setTableName( n );
+ y2mil( "ev:" << *i );
+ }
+ }
+ }
+
+
namespace storage
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.5/libstorage/src/EvmsCo.h new/yast2-storage-2.15.6/libstorage/src/EvmsCo.h
--- old/yast2-storage-2.15.5/libstorage/src/EvmsCo.h 2007-02-12 16:35:20.000000000 +0100
+++ new/yast2-storage-2.15.6/libstorage/src/EvmsCo.h 2007-02-28 16:02:40.000000000 +0100
@@ -123,6 +123,7 @@
void logDifference( const EvmsCo& d ) const;
bool checkConsistency() const;
void updateMd();
+ void changeDeviceName( const string& old, const string& nw );
static void activate( bool val=true );
static int activateDevices();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.5/libstorage/src/Partition.cc new/yast2-storage-2.15.6/libstorage/src/Partition.cc
--- old/yast2-storage-2.15.5/libstorage/src/Partition.cc 2007-02-06 12:23:24.000000000 +0100
+++ new/yast2-storage-2.15.6/libstorage/src/Partition.cc 2007-03-15 13:18:09.000000000 +0100
@@ -229,6 +229,20 @@
reg = Region( cylStart(), disk()->kbToCylinder(size_k) );
}
+bool Partition::operator== ( const Partition& rhs ) const
+ {
+ return( orig_num == rhs.orig_num &&
+ num == rhs.num &&
+ del == rhs.del );
+ }
+
+bool Partition::operator< ( const Partition& rhs ) const
+ {
+ if( orig_num!=rhs.orig_num )
+ return( orig_num= ( const Partition& rhs ) const
+ { return( !(*this ( const Partition& rhs ) const
+ { return( !(*this<=rhs) ); }
+
protected:
Partition& operator=( const Partition& );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.5/libstorage/src/Storage.cc new/yast2-storage-2.15.6/libstorage/src/Storage.cc
--- old/yast2-storage-2.15.5/libstorage/src/Storage.cc 2007-02-21 12:44:40.000000000 +0100
+++ new/yast2-storage-2.15.6/libstorage/src/Storage.cc 2007-03-15 13:18:09.000000000 +0100
@@ -1368,13 +1368,12 @@
{
if( vol->getUsedByType() != UB_NONE )
ret = removeUsing( vol->device(), vol->getUsedBy() );
- if( ret==0 )
- ret = disk->removePartition( vol->nr() );
if( ret==0 && haveEvms() )
{
- handleEvmsRemoveDevice( disk, vol->device(),
- disk->isLogical(vol->nr()) );
+ handleEvmsRemoveDevice( disk, vol->device(), false );
}
+ if( ret==0 )
+ ret = disk->removePartition( vol->nr() );
}
else
ret = STORAGE_REMOVE_USED_VOLUME;
@@ -1393,15 +1392,14 @@
{
if( vol->getUsedByType() != UB_NONE )
ret = removeUsing( vol->device(), vol->getUsedBy() );
- if( ret==0 )
- ret = disk->removePartition( vol->nr() );
/*
if( ret==0 && haveEvms() )
{
- handleEvmsRemoveDevice( disk, vol->device(),
- disk->isLogical(vol->nr()) );
+ handleEvmsRemoveDevice( disk, vol->device(), false );
}
*/
+ if( ret==0 )
+ ret = disk->removePartition( vol->nr() );
}
else
ret = STORAGE_REMOVE_USED_VOLUME;
@@ -2409,8 +2407,6 @@
string vdev = vol->device();
if( vol->getUsedByType() != UB_NONE )
ret = removeUsing( vdev, vol->getUsedBy() );
- if( ret==0 )
- ret = cont->removeVolume( &(*vol) );
if( ret==0 && cont->type()==DISK && haveEvms() )
{
Disk* disk = dynamic_cast(&(*cont));
@@ -2421,9 +2417,10 @@
unsigned num = 0;
if( !tmp.empty() )
tmp >> num;
- bool rename = disk!=NULL && num>0 && disk->isLogical(num);
- handleEvmsRemoveDevice( disk, vdev, rename );
+ handleEvmsRemoveDevice( disk, vdev, false );
}
+ if( ret==0 )
+ ret = cont->removeVolume( &(*vol) );
}
else
ret = STORAGE_REMOVE_USED_VOLUME;
@@ -2744,11 +2741,11 @@
return( v.cType()==DISK && v.created() );
}
-int Storage::evmsActivate()
+int Storage::evmsActivate( bool forced )
{
int ret = 0;
assertInit();
- y2mil( "start" );
+ y2mil( "start forced:" << forced );
if( readonly )
{
ret = STORAGE_CHANGE_READONLY;
@@ -2756,7 +2753,7 @@
else
{
ConstEvmsPair p = evmsPair(evmsCo);
- if( !p.empty() )
+ if( !p.empty() && !forced )
{
y2warning( "evms already active:%u", p.length() );
for( ConstEvmsIterator ei=p.begin(); ei!=p.end(); ++ei )
@@ -2791,10 +2788,8 @@
if( vi!=p.end() )
{
const Partition* p = dynamic_cast(&(*vi));
- bool rename = p!=NULL && p->nr()>0 &&
- p->disk()->isLogical(p->nr());
y2mil( "ev del :" << *ei );
- handleEvmsRemoveDevice( p->disk(), vi->device(), rename );
+ handleEvmsRemoveDevice( p->disk(), vi->device(), false );
}
++ei;
}
@@ -3696,7 +3691,15 @@
else
{
if( rhs->needShrink() == lhs->needShrink() )
- return( *rhs > *lhs );
+ {
+ if( rhs->cType()!=DISK || rhs->cType()!=DISK )
+ return( *rhs > *lhs );
+ else
+ {
+ return( *static_cast(rhs) >
+ *static_cast(lhs) );
+ }
+ }
else
return( rhs->needShrink() );
}
@@ -3999,7 +4002,8 @@
i->getToCommit( FORMAT, co, vol );
i->getToCommit( MOUNT, co, vol );
Disk* disk;
- if( i->type()==DISK && (disk = dynamic_cast(&(*i)))!=NULL )
+ if( i->type()==DISK && arch().find("ppc")==0 &&
+ (disk = dynamic_cast(&(*i)))!=NULL )
{
Disk::PartPair dp = disk->partPair(Disk::bootSpecial);
for (Disk::PartIter i2 = dp.begin(); i2 != dp.end(); ++i2)
@@ -4100,6 +4104,17 @@
else if( dm==NULL )
y2warning( "not a Dm descendant %s", v->device().c_str() );
}
+ VolIterator v;
+ DiskIterator d;
+ if( findVolume( dev, v ))
+ {
+ v->triggerUdevUpdate();
+ }
+ else if( (d=findDisk( dev ))!=dEnd())
+ {
+ d->triggerUdevUpdate();
+ }
+ waitForDevice();
y2milestone( "ret:%d", ret );
return( ret );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.5/libstorage/src/Storage.h new/yast2-storage-2.15.6/libstorage/src/Storage.h
--- old/yast2-storage-2.15.5/libstorage/src/Storage.h 2007-02-21 12:36:25.000000000 +0100
+++ new/yast2-storage-2.15.6/libstorage/src/Storage.h 2007-03-14 13:14:42.000000000 +0100
@@ -376,7 +376,7 @@
int changeLvStripeSize( const string& vg, const string& name,
unsigned long long stripeSize );
- int evmsActivate();
+ int evmsActivate( bool force );
int createEvmsContainer( const string& name, unsigned long long peSizeK,
bool lvm1, const deque<string>& devs );
int modifyEvmsContainer( const string& old_name, const string& new_name,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.5/libstorage/src/StorageInterface.h new/yast2-storage-2.15.6/libstorage/src/StorageInterface.h
--- old/yast2-storage-2.15.5/libstorage/src/StorageInterface.h 2007-02-22 18:33:29.000000000 +0100
+++ new/yast2-storage-2.15.6/libstorage/src/StorageInterface.h 2007-03-14 13:14:42.000000000 +0100
@@ -1593,9 +1593,10 @@
* during system startup. This command is executed immediately,
* there is no need for a call to commit().
*
+ * @param force flag if activation should be forced
* @return zero if all is ok, a negative number to indicate an error
*/
- virtual int evmsActivate() = 0;
+ virtual int evmsActivate( bool force ) = 0;
/**
* Create a Software raid device by name
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.5/libstorage/src/Volume.h new/yast2-storage-2.15.6/libstorage/src/Volume.h
--- old/yast2-storage-2.15.5/libstorage/src/Volume.h 2007-01-11 19:05:58.000000000 +0100
+++ new/yast2-storage-2.15.6/libstorage/src/Volume.h 2007-03-14 13:14:42.000000000 +0100
@@ -163,6 +163,7 @@
void getInfo( storage::VolumeInfo& info ) const;
void mergeFstabInfo( storage::VolumeInfo& tinfo, const FstabEntry& fste ) const;
void updateFsData();
+ void triggerUdevUpdate();
static bool loopInUse( Storage* sto, const string& loopdev );
struct SkipDeleted
@@ -224,7 +225,6 @@
const string& pwdfile, bool format ) const;
storage::EncryptType detectEncryption();
string getFilesysSysfsPath() const;
- void triggerUdevUpdate();
const Container* const cont;
bool numeric;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.5/Makefile.am new/yast2-storage-2.15.6/Makefile.am
--- old/yast2-storage-2.15.5/Makefile.am 2006-10-12 12:30:30.000000000 +0200
+++ new/yast2-storage-2.15.6/Makefile.am 2007-03-13 09:53:08.000000000 +0100
@@ -8,6 +8,7 @@
#where devtools are
PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
+Y2TOOL = $(PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -95,7 +96,7 @@
done
pot:
- y2tool y2makepot -s $(srcdir)
+ $(Y2TOOL) y2makepot -s $(srcdir)
install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -116,7 +117,7 @@
fi
spellcheck: pot
- y2tool pot-spellcheck
+ $(Y2TOOL) pot-spellcheck
# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
@@ -143,20 +144,20 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(PREFIX)/bin/y2tool; then \
- echo "$(PREFIX)/bin/y2tool: not found."; \
+ if ! test -x $(Y2TOOL); then \
+ echo "$(Y2TOOL): not found."; \
echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
+ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
-TAGVERSION = $(PREFIX)/bin/y2tool tagversion
+TAGVERSION = $(Y2TOOL) tagversion
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -199,10 +200,13 @@
false; \
fi
+check-textdomain:
+ $(Y2TOOL) check-textdomain $(srcdir)
+
stable: checkin-stable
checkin-stable: package
- $(PREFIX)/bin/y2tool checkin-stable
+ $(Y2TOOL) checkin-stable
# For po/ modules
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.5/Makefile.in new/yast2-storage-2.15.6/Makefile.in
--- old/yast2-storage-2.15.5/Makefile.in 2006-10-12 12:31:01.000000000 +0200
+++ new/yast2-storage-2.15.6/Makefile.in 2007-03-13 09:53:42.000000000 +0100
@@ -245,6 +245,7 @@
#where devtools are
PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
+Y2TOOL = $(PREFIX)/bin/y2tool
SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS)
ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4)
HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE)
@@ -274,7 +275,7 @@
$(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) $(am__append_1)
@CREATE_PKGCONFIG_NOARCH_TRUE@@CREATE_PKGCONFIG_TRUE@pkgconfigdata_DATA = $(RPMNAME).pc
@CREATE_PKGCONFIG_NOARCH_FALSE@@CREATE_PKGCONFIG_TRUE@pkgconfig_DATA = $(RPMNAME).pc
-TAGVERSION = $(PREFIX)/bin/y2tool tagversion
+TAGVERSION = $(Y2TOOL) tagversion
# test ! -d $(srcdir)/po \
# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
@@ -800,7 +801,7 @@
done
pot:
- y2tool y2makepot -s $(srcdir)
+ $(Y2TOOL) y2makepot -s $(srcdir)
install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -821,7 +822,7 @@
fi
spellcheck: pot
- y2tool pot-spellcheck
+ $(Y2TOOL) pot-spellcheck
# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
@@ -848,18 +849,18 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(PREFIX)/bin/y2tool; then \
- echo "$(PREFIX)/bin/y2tool: not found."; \
+ if ! test -x $(Y2TOOL); then \
+ echo "$(Y2TOOL): not found."; \
echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
+ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -902,10 +903,13 @@
false; \
fi
+check-textdomain:
+ $(Y2TOOL) check-textdomain $(srcdir)
+
stable: checkin-stable
checkin-stable: package
- $(PREFIX)/bin/y2tool checkin-stable
+ $(Y2TOOL) checkin-stable
# For po/ modules
checkpo:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.5/storage/src/include/custom_part_dialogs.ycp new/yast2-storage-2.15.6/storage/src/include/custom_part_dialogs.ycp
--- old/yast2-storage-2.15.5/storage/src/include/custom_part_dialogs.ycp 2007-02-06 12:25:51.000000000 +0100
+++ new/yast2-storage-2.15.6/storage/src/include/custom_part_dialogs.ycp 2007-02-28 10:54:14.000000000 +0100
@@ -16,7 +16,7 @@
*
*************************************************************
- $Id: custom_part_dialogs.ycp 35893 2007-02-06 11:25:45Z fehr $
+ $Id: custom_part_dialogs.ycp 36552 2007-02-28 09:54:12Z fehr $
*/
{
@@ -862,11 +862,13 @@
new_val["used_fs"]:Partitions::DefaultFs() == file_system_name;
}
});
- y2debug( "fs_sel=%1", fs_sel );
+ y2milestone( "fs_sel=%1", fs_sel );
+ y2milestone( "DefFs=%1", Partitions::DefaultFs() );
if( haskey( fs_sel, Partitions::DefaultFs() ) &&
size(filter( any k, map e, fs_sel, ``(e["selected"]:false) ))==0 )
{
fs_sel[Partitions::DefaultFs(),"selected"] = true;
+ y2milestone( "fs_sel=%1", fs_sel );
}
foreach( symbol fs_type, map entry, fs_sel,
``{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.5/storage/src/include/do_proposal_flexible.ycp new/yast2-storage-2.15.6/storage/src/include/do_proposal_flexible.ycp
--- old/yast2-storage-2.15.5/storage/src/include/do_proposal_flexible.ycp 2007-02-19 17:05:30.000000000 +0100
+++ new/yast2-storage-2.15.6/storage/src/include/do_proposal_flexible.ycp 2007-02-28 10:54:14.000000000 +0100
@@ -14,7 +14,7 @@
*
*************************************************************
- $Id: do_proposal_flexible.ycp 36285 2007-02-19 16:05:29Z fehr $
+ $Id: do_proposal_flexible.ycp 36552 2007-02-28 09:54:12Z fehr $
*/
{
@@ -818,6 +818,10 @@
{
p["label"] = value;
}
+ else if( size(p["label"]:"")>0 )
+ {
+ p["label"] = "";
+ }
if( p["fsid"]:0 != fsid )
{
p["change_fsid"] = true;
@@ -912,6 +916,10 @@
{
part["label"] = value;
}
+ else if( size(part["label"]:"")>0 )
+ {
+ part["label"] = "";
+ }
part["fsid"] = fsid;
part["fstype"] = Partitions::FsIdToString( fsid );
if( size(mount)==0 && size(vgname)>0 )
@@ -990,6 +998,10 @@
{
part["label"] = value;
}
+ else if( size(part["label"]:"")>0 )
+ {
+ part["label"] = "";
+ }
part["fsid"] = fsid;
part["fstype"] = Partitions::FsIdToString( fsid );
if( size(mount)==0 && size(vgname)>0 )
@@ -2242,6 +2254,8 @@
p["mount"] = Partitions::BootMount();
p["used_fs"] = Partitions::DefaultBootFs();
p["format"] = true;
+ if( size(p["label"]:"")>0 )
+ p["label"] = "";
p["fstopt"] =
FileSystems::DefaultFstabOptions( p );
p["fs_options"] =
@@ -2282,6 +2296,8 @@
p["mount"] = mp;
p["used_fs"] = Partitions::DefaultFs();
p["format"] = true;
+ if( size(p["label"]:"")>0 )
+ p["label"] = "";
p["fstopt"] = FileSystems::DefaultFstabOptions( p );
p["fs_options"] =
FileSystems::DefaultFormatOptions( p );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.5/storage/src/modules/Storage.ycp new/yast2-storage-2.15.6/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.15.5/storage/src/modules/Storage.ycp 2007-02-22 18:34:21.000000000 +0100
+++ new/yast2-storage-2.15.6/storage/src/modules/Storage.ycp 2007-03-14 13:15:10.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 36429 2007-02-22 17:34:19Z fehr $
+ * $Id: Storage.ycp 36953 2007-03-14 12:15:04Z fehr $
*/
{
@@ -2676,7 +2676,8 @@
global boolean ActivateEvms()
{
integer ret = 0;
- ret = LibStorage::StorageInterface::evmsActivate( sint );
+ y2milestone( "Mode:%1", Mode::mode() );
+ ret = LibStorage::StorageInterface::evmsActivate( sint, Mode::update() );
if( ret<0 )
y2error( "activateEvms sint ret:%1", ret );
UpdateTargetMap();
@@ -4982,7 +4983,7 @@
DiskMap = $[];
string cmd = "";
cmd = "LIBHD_HDDB_DIR=" + Installation::destdir + "/var/lib/hardware " +
- "hwinfo --map";
+ "hwinfo --verbose --map";
y2milestone( "BuildDiskmap cmd %1", cmd );
map bo = (map)SCR::Execute (.target.bash_output, cmd );
y2milestone( "BuildDiskmap bo %1", bo );
@@ -5009,7 +5010,6 @@
DiskMapVersion = oldv;
else
DiskMapVersion = $[];
- y2milestone( "BuildDiskmap bo %1", bo );
y2milestone( "BuildDiskmap DiskMap %1", DiskMap );
y2milestone( "BuildDiskmap DiskMapVersion %1", DiskMapVersion );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.5/VERSION new/yast2-storage-2.15.6/VERSION
--- old/yast2-storage-2.15.5/VERSION 2007-02-26 16:27:18.000000000 +0100
+++ new/yast2-storage-2.15.6/VERSION 2007-03-15 18:43:47.000000000 +0100
@@ -1 +1 @@
-2.15.5
+2.15.6
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org