Hello community,
here is the log from the commit of package yast2-storage
checked in at Wed Nov 5 18:23:11 CET 2008.
--------
--- yast2-storage/yast2-storage.changes 2008-11-03 17:21:28.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2008-11-05 10:09:40.903965000 +0100
@@ -1,0 +2,6 @@
+Tue Nov 04 16:44:41 CET 2008 - aschnell@suse.de
+
+- fixed resize warning
+- 2.17.48
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-storage-2.17.47.tar.bz2
New:
----
yast2-storage-2.17.48.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.N15904/_old 2008-11-05 18:23:06.000000000 +0100
+++ /var/tmp/diff_new_pack.N15904/_new 2008-11-05 18:23:06.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.17.47)
+# spec file for package yast2-storage (Version 2.17.48)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-storage
-Version: 2.17.47
+Version: 2.17.48
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.17.47.tar.bz2
+Source0: yast2-storage-2.17.48.tar.bz2
Prefix: /usr
BuildRequires: blocxx-devel boost-devel docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-perl-bindings yast2-testsuite
Requires: parted yast2-storage-lib = %version yast2-perl-bindings mdadm lvm2 dmraid multipath-tools kpartx cryptsetup
@@ -58,7 +58,7 @@
Arvin Schnell
%prep
-%setup -n yast2-storage-2.17.47
+%setup -n yast2-storage-2.17.48
%build
%{prefix}/bin/y2tool y2autoconf
@@ -183,6 +183,9 @@
%doc %{prefix}/share/doc/packages/yast2-storage/libstorage
%doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description
%changelog
+* Tue Nov 04 2008 aschnell@suse.de
+- fixed resize warning
+- 2.17.48
* Fri Oct 31 2008 aschnell@suse.de
- added function getCommitInfo (for fate #302857)
- 2.17.47
@@ -392,7 +395,7 @@
* Sat Jul 19 2008 aschnell@suse.de
- removed evms subpackage
- version 2.17.2
-* Sat Jun 07 2008 aschnell@suse.de
+* Fri Jun 06 2008 aschnell@suse.de
- fixed deletion of logical volumes (bnc #397186)
- version 2.17.1
* Mon Jun 02 2008 aschnell@suse.de
@@ -1861,7 +1864,7 @@
* Tue Aug 17 2004 fehr@suse.de
- warn when a SCSI disk with more than 15 partitions is found (#43805)
- 2.10.7
-* Tue Aug 17 2004 nashif@suse.de
+* Mon Aug 16 2004 nashif@suse.de
- /usr/sbin/hwcan -> /sbin/hwscan (#43601)
- 2.10.6
* Mon Aug 16 2004 fehr@suse.de
++++++ yast2-storage-2.17.47.tar.bz2 -> yast2-storage-2.17.48.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.47/configure new/yast2-storage-2.17.48/configure
--- old/yast2-storage-2.17.47/configure 2008-11-03 17:02:23.000000000 +0100
+++ new/yast2-storage-2.17.48/configure 2008-11-05 10:08:03.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-storage 2.17.47.
+# Generated by GNU Autoconf 2.61 for yast2-storage 2.17.48.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-storage'
PACKAGE_TARNAME='yast2-storage'
-PACKAGE_VERSION='2.17.47'
-PACKAGE_STRING='yast2-storage 2.17.47'
+PACKAGE_VERSION='2.17.48'
+PACKAGE_STRING='yast2-storage 2.17.48'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1449,7 +1449,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.17.47 to adapt to many kinds of systems.
+\`configure' configures yast2-storage 2.17.48 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1520,7 +1520,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-storage 2.17.47:";;
+ short | recursive ) echo "Configuration of yast2-storage 2.17.48:";;
esac
cat <<\_ACEOF
@@ -1630,7 +1630,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-storage configure 2.17.47
+yast2-storage configure 2.17.48
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1644,7 +1644,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.17.47, which was
+It was created by yast2-storage $as_me 2.17.48, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2465,7 +2465,7 @@
# Define the identity of the package.
PACKAGE='yast2-storage'
- VERSION='2.17.47'
+ VERSION='2.17.48'
cat >>confdefs.h <<_ACEOF
@@ -2693,7 +2693,7 @@
-VERSION="2.17.47"
+VERSION="2.17.48"
RPMNAME="yast2-storage"
MAINTAINER="Arvin Schnell "
@@ -21746,7 +21746,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.17.47, which was
+This file was extended by yast2-storage $as_me 2.17.48, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21799,7 +21799,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-storage config.status 2.17.47
+yast2-storage config.status 2.17.48
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.47/configure.in new/yast2-storage-2.17.48/configure.in
--- old/yast2-storage-2.17.47/configure.in 2008-11-03 17:02:08.000000000 +0100
+++ new/yast2-storage-2.17.48/configure.in 2008-11-05 10:07:48.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-storage, 2.17.47, http://bugs.opensuse.org/, yast2-storage)
+AC_INIT(yast2-storage, 2.17.48, 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.17.47"
+VERSION="2.17.48"
RPMNAME="yast2-storage"
MAINTAINER="Arvin Schnell "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.47/libstorage/src/Region.h new/yast2-storage-2.17.48/libstorage/src/Region.h
--- old/yast2-storage-2.17.47/libstorage/src/Region.h 2008-10-16 11:09:10.000000000 +0200
+++ new/yast2-storage-2.17.48/libstorage/src/Region.h 2008-11-03 18:40:48.000000000 +0100
@@ -20,7 +20,7 @@
Region intersect( const Region& r ) const
{
Region ret;
- if( r.start() <= end() && r.end() >= start() )
+ if (doIntersect(r))
{
unsigned long s = std::max( r.start(), start() );
unsigned long e = std::min( r.end(), end() );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.47/storage/src/include/ep-dialogs.ycp new/yast2-storage-2.17.48/storage/src/include/ep-dialogs.ycp
--- old/yast2-storage-2.17.47/storage/src/include/ep-dialogs.ycp 2008-10-30 11:00:24.000000000 +0100
+++ new/yast2-storage-2.17.48/storage/src/include/ep-dialogs.ycp 2008-11-04 16:42:42.000000000 +0100
@@ -302,7 +302,7 @@
{
if (ret_mp["field"]:`none != `none)
UI::SetFocus(`id(ret_mp["field"]:`none));
- widget = `again;
+ widget = `again;
continue;
}
}
@@ -498,7 +498,7 @@
}
//data i.e. partition
- boolean DlgResize(map &data , map disk, symbol flavour)
+ boolean DlgResize(map &data, map disk)
{
integer cyl_size = disk["cyl_size"]:1;
integer free_cyl_after = Storage::FreeCylAfter( disk, data);
@@ -568,26 +568,33 @@
string free = "";
string available = "";
- if (flavour == `part)
+ switch (data["type"]:`unknown)
{
- //FIXME: add special case for Windows part.
- used = _("Used\nSpace\n%1 ") + unit;
+ case `primary:
+ case `logical:
- if ( Partitions::IsSwapPartition( fsid ) )
- free = _("Swap\nSpace\n%1 ") + unit;
- else
- free = _("Free\nSpace\n%1 ") + unit;
+ //FIXME: add special case for Windows part.
+ used = _("Used\nSpace\n%1 ") + unit;
- available = _("Unused\nDisk\n%1 ") + unit;
- }
- if (flavour == `lv)
- {
- // Labels for bar graph. "%1" will be replace with a numeric value.
- used = _("LV\nUsed\n%1") + unit;
- // Labels for bar graph. "%1" will be replace with a numeric value.
- free = _("LV\nFree\n%1") + unit;
- // Labels for bar graph. "%1" will be replace with a numeric value.
- available = _("VG\nFree\n%1") + unit;
+ if ( Partitions::IsSwapPartition( fsid ) )
+ free = _("Swap\nSpace\n%1 ") + unit;
+ else
+ free = _("Free\nSpace\n%1 ") + unit;
+
+ available = _("Unused\nDisk\n%1 ") + unit;
+
+ break;
+
+ case `lvm:
+
+ // Labels for bar graph. "%1" will be replace with a numeric value.
+ used = _("LV\nUsed\n%1") + unit;
+ // Labels for bar graph. "%1" will be replace with a numeric value.
+ free = _("LV\nFree\n%1") + unit;
+ // Labels for bar graph. "%1" will be replace with a numeric value.
+ available = _("VG\nFree\n%1") + unit;
+
+ break;
}
return [ used, free, available ];
@@ -601,57 +608,62 @@
return _("Remaining Free Space");
}
- if (flavour == `part)
+ switch (data["type"]:`unknown)
{
+ case `primary:
+ case `logical:
- // Heading for dialog
- heading = sformat(_("Resize Partition %1"), device);
+ // Heading for dialog
+ heading = sformat(_("Resize Partition %1"), device);
- map size_data = $[];
+ map size_data = $[];
- if ( Partitions::IsSwapPartition( fsid ) )
- {
- size_data = AdjustSwapPartitionDf( size_data );
- }
- else
- {
- size_data = Storage::GetFreeSpace( device, 0, used_fs, true);
-
- if (size( size_data ) == 0 || !size_data["ok"]:false)
+ if ( Partitions::IsSwapPartition( fsid ) )
{
- y2error("Failed to retrieve FreeSpace %1, filesystem %2", device, data["used_fs"]:`none);
- //FIXME: Really?
- Popup::Error( sformat( _("Partition %1 cannot be resized\nbecause the filesystem seems to be inconsistent"), device ));
- return false;
+ size_data = AdjustSwapPartitionDf( size_data );
+ }
+ else
+ {
+ size_data = Storage::GetFreeSpace( device, 0, used_fs, true);
+
+ if (size( size_data ) == 0 || !size_data["ok"]:false)
+ {
+ y2error("Failed to retrieve FreeSpace %1, filesystem %2", device, data["used_fs"]:`none);
+ //FIXME: Really?
+ Popup::Error( sformat( _("Partition %1 cannot be resized\nbecause the filesystem seems to be inconsistent"), device ));
+ return false;
+ }
}
- }
- AdjustUnits( size_data );
- used = ToUI( size_data["used"]:0 );
- free = ToUI( size_data["df_free"]:0 );
- av_space =ToUI( av_space );
- total = used + free + av_space;
-
- y2milestone("ResizePartition used %1, free %2, available %3, total %4",
- Storage::ByteToHumanString(used), Storage::ByteToHumanString(free),
- Storage::ByteToHumanString(av_space), Storage::ByteToHumanString(total) );
+ AdjustUnits( size_data );
+ used = ToUI( size_data["used"]:0 );
+ free = ToUI( size_data["df_free"]:0 );
+ av_space =ToUI( av_space );
+ total = used + free + av_space;
- }
- else if (flavour == `lv)
- {
- // Heading for dialog
- heading = sformat(_("Resize Logical Volume %1"), device);
+ y2milestone("ResizePartition used %1, free %2, available %3, total %4",
+ Storage::ByteToHumanString(used), Storage::ByteToHumanString(free),
+ Storage::ByteToHumanString(av_space), Storage::ByteToHumanString(total) );
+
+ break;
+
+ case `lvm:
+
+ // Heading for dialog
+ heading = sformat(_("Resize Logical Volume %1"), device);
+
+ // Labels for input fields. "%1" will be replaced with the current unit (MB).
+ field_label_free = sformat(_("LV Free (%1)"), unit);
+ // Labels for input fields. "%1" will be replaced with the current unit (MB).
+ field_label_vg_free = sformat(_("VG Free (%1)"), unit);
+
+ break;
- // Labels for input fields. "%1" will be replaced with the current unit (MB).
- field_label_free = sformat(_("LV Free (%1)"), unit);
- // Labels for input fields. "%1" will be replaced with the current unit (MB).
- field_label_vg_free = sformat(_("VG Free (%1)"), unit);
}
term content = `Empty();
- if (UI::HasSpecialWidget(`BarGraph) &&
- UI::HasSpecialWidget(`Slider))
+ if (UI::HasSpecialWidget(`BarGraph) && UI::HasSpecialWidget(`Slider))
{
content = `VBox(
`BarGraph(`id(`graph), `opt(`vstretch), [used, free, av_space], BarGraphLabels() ),
@@ -695,14 +707,15 @@
UI::ChangeWidget(`help, `HelpText, help_text);
- any widget = nil;
+ symbol widget = nil;
integer old_size = used + free;
integer new_size = old_size;
do {
- widget = UI::UserInput();
- switch ( (symbol) widget)
+ widget = (symbol) UI::UserInput();
+
+ switch (widget)
{
case `new_size:
{
@@ -712,6 +725,7 @@
UI::ChangeWidget(`id(`free), `Value, sformat("%1: %2 %3", FreeSpaceLabel(), new_free, unit));
break;
}
+
case `ok:
{
if ( new_size != old_size )
@@ -720,11 +734,11 @@
//calculate the difference
list old_reg = data["region"]:[];
- list new_reg = [ data["region",0]:0, PartedSizeToCly( (tofloat(new_size*factor)), cyl_size ) ];
- integer diff = old_reg[1]:0 - new_reg[1]:0;
+ list new_reg = [ data["region", 0]:0, PartedSizeToCly( (tofloat(new_size*factor)), cyl_size ) ];
+
+ integer diff = new_reg[1]:0 - old_reg[1]:0;
y2milestone("ResizePartition - new size %1 %2, in cylinders %3", new_size, unit, diff);
- data["region"] = new_reg;
//1 - ask & be interactive, 2 - we are on lvm, 3 - cyl.diff, 4 - filesystem, 5 - mountpoint
if ( !CheckResizePossible( false, false, diff, used_fs, mountpoint ))
@@ -738,21 +752,22 @@
}
else
{
- //mark partition for resizing
+ data["region"] = new_reg;
data["resize"] = true;
}
}
break;
}
+
case `cancel:
break;
}
- } while ( widget != `cancel && widget != `ok);
+ } while (widget != `cancel && widget != `ok);
UI::CloseDialog();
- return ( widget == `ok);
+ return widget == `ok;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.47/storage/src/include/ep-hd-dialogs.ycp new/yast2-storage-2.17.48/storage/src/include/ep-hd-dialogs.ycp
--- old/yast2-storage-2.17.47/storage/src/include/ep-hd-dialogs.ycp 2008-10-30 11:32:59.000000000 +0100
+++ new/yast2-storage-2.17.48/storage/src/include/ep-hd-dialogs.ycp 2008-11-04 15:07:13.000000000 +0100
@@ -331,6 +331,6 @@
boolean DlgResizePartition( map &data, map disk )
{
- return DlgResize(data, disk, `part);
+ return DlgResize(data, disk);
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.47/storage/src/include/ep-lvm-dialogs.ycp new/yast2-storage-2.17.48/storage/src/include/ep-lvm-dialogs.ycp
--- old/yast2-storage-2.17.47/storage/src/include/ep-lvm-dialogs.ycp 2008-10-24 11:27:24.000000000 +0200
+++ new/yast2-storage-2.17.48/storage/src/include/ep-lvm-dialogs.ycp 2008-11-04 15:07:35.000000000 +0100
@@ -610,6 +610,6 @@
//the empty map is here because data on whole disk need to be passed
//to resize dialog for partitions (to get available space etc.)
//for LVMs we probably don't need it)
- return DlgResize(data, $[], `lv);
+ return DlgResize(data, $[]);
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.47/storage/src/modules/Storage.ycp new/yast2-storage-2.17.48/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.17.47/storage/src/modules/Storage.ycp 2008-10-29 20:37:49.000000000 +0100
+++ new/yast2-storage-2.17.48/storage/src/modules/Storage.ycp 2008-11-03 19:14:26.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 52712 2008-10-29 19:37:49Z aschnell $
+ * $Id: Storage.ycp 52861 2008-11-03 18:14:26Z aschnell $
*/
{
@@ -66,6 +66,7 @@
import "LibStorage::DmraidCoInfo";
import "LibStorage::DmmultipathCoInfo";
import "LibStorage::PartitionSlotInfo";
+ import "LibStorage::CommitInfo";
map conv_ctype =
$[ "def_sym" : `CT_UNKNOWN,
@@ -3965,6 +3966,20 @@
return( ret );
}
+
+global map GetCommitInfo()
+{
+ any info = LibStorage::CommitInfo::new("LibStorage::CommitInfo");
+ LibStorage::StorageInterface::getCommitInfo(sint, true, info);
+
+ map ret = $[
+ `destructive : LibStorage::CommitInfo::swig_destructive_get(info)
+ ];
+
+ return ret;
+}
+
+
string save_chtxt = "";
global string ChangeText()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.47/storage.pot new/yast2-storage-2.17.48/storage.pot
--- old/yast2-storage-2.17.47/storage.pot 2008-10-31 10:26:04.000000000 +0100
+++ new/yast2-storage-2.17.48/storage.pot 2008-11-03 17:29:52.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-31 10:26+0100\n"
+"POT-Creation-Date: 2008-11-03 17:29+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -4224,7 +4224,7 @@
msgid "Network File System (NFS)"
msgstr ""
-#: storage/src/include/ep-nfs.ycp:116
+#: storage/src/include/ep-nfs.ycp:119
#, ycp-format
msgid ""
"Test mount of NFS share '%1' failed.\n"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.47/VERSION new/yast2-storage-2.17.48/VERSION
--- old/yast2-storage-2.17.47/VERSION 2008-10-30 16:50:04.000000000 +0100
+++ new/yast2-storage-2.17.48/VERSION 2008-11-05 10:07:15.000000000 +0100
@@ -1 +1 @@
-2.17.47
+2.17.48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org