Hello community,
here is the log from the commit of package yast2-storage for openSUSE:Factory
checked in at Thu Jul 16 17:04:43 CEST 2009.
--------
--- yast2-storage/yast2-storage.changes 2009-07-09 15:42:32.000000000 +0200
+++ yast2-storage/yast2-storage.changes 2009-07-16 11:55:57.000000000 +0200
@@ -1,0 +2,12 @@
+Thu Jul 16 11:06:24 CEST 2009 - aschnell@suse.de
+
+- use new getPartitionName() from libstorage
+- 2.18.15
+
+-------------------------------------------------------------------
+Tue Jul 14 16:55:28 CEST 2009 - aschnell@suse.de
+
+- replaced Recommends in yast2-storage with Supplements in
+ yast2-qt-graph (bnc #521545)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.WxnDFC/_old 2009-07-16 17:03:21.000000000 +0200
+++ /var/tmp/diff_new_pack.WxnDFC/_new 2009-07-16 17:03:21.000000000 +0200
@@ -20,7 +20,7 @@
Name: yast2-storage
Version: 2.18.14
-Release: 1
+Release: 2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-storage-2.18.14.tar.bz2
Prefix: /usr
@@ -28,7 +28,7 @@
License: GPL v2 or later
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.18.17 yast2 >= 2.18.19 yast2-core-devel >= 2.18.1 yast2-devtools
+BuildRequires: libstorage-devel >= 2.18.18 yast2 >= 2.18.19 yast2-core-devel >= 2.18.1 yast2-devtools
BuildRequires: yast2-perl-bindings yast2-testsuite
Requires: libstorage = %(echo `rpm -q --queryformat '%{VERSION}' libstorage`)
Requires: yast2-perl-bindings yast2-core >= 2.18.3 yast2 >= 2.18.19 yast2-libyui >= 2.18.7
@@ -36,7 +36,6 @@
Requires: yast2-s390
%endif
PreReq: %fillup_prereq
-Recommends: yast2_ui_graph
Provides: y2a_fdsk yast2-config-disk
Obsoletes: y2a_fdsk yast2-config-disk
Provides: yast2-agent-fdisk yast2-agent-fdisk-devel
@@ -134,5 +133,4 @@
%defattr(-,root,root)
%doc %{prefix}/share/doc/packages/yast2-storage/autodocs
%doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description
-
%changelog
++++++ yast2-storage-2.18.14.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.18.14/storage/src/modules/Storage.ycp new/yast2-storage-2.18.14/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.18.14/storage/src/modules/Storage.ycp 2009-07-07 15:56:30.000000000 +0200
+++ new/yast2-storage-2.18.14/storage/src/modules/Storage.ycp 2009-07-16 11:50:22.000000000 +0200
@@ -19,7 +19,7 @@
* wurde versucht "intelligent" zu gestallten und ist im einzelen bei den
* entspechenden Funktionen n�her erkl�rt.
*
- * $Id: Storage.ycp 57914 2009-07-07 13:56:29Z aschnell $
+ * $Id: Storage.ycp 58067 2009-07-16 09:50:21Z aschnell $
*/
{
module "Storage";
@@ -184,43 +184,6 @@
string part_insts = "";
- /**
- * Returns Device Name
- *
- * @param string Disk
- * @param any partition
- * @return string device name
- *
- * @example Storage::GetDeviceName ("/dev/md", 1)
- */
-global define string GetDeviceName( string disk, any partition )
- {
- string ret = disk;
-
- if( is( partition, integer ) )
- {
- if( search( disk, "/dev/cciss/" )==0 ||
- search( disk, "/dev/ida/" )==0 ||
- search( disk, "/dev/ataraid/" )==0 ||
- search( disk, "/dev/etherd/" )==0 ||
- search( disk, "/dev/rd/" )==0 )
- {
- ret = ret + "p";
- }
- else if( search( disk, "/dev/mapper/" )==0 )
- {
- ret = ret + "_part";
- }
- ret = ret + sformat( "%1", partition );
- }
- else if( size( (string)partition )>0 )
- {
- ret = ret + "/" + (string)partition;
- }
- return( ret );
- };
-
-
global boolean IsKernelDeviceName(string device)
{
return substring(device, 0, 6) != "LABEL=" &&
@@ -445,6 +408,31 @@
}
+ /**
+ * Returns Device Name
+ *
+ * @param string Disk
+ * @param any partition
+ * @return string device name
+ *
+ * @example Storage::GetDeviceName("/dev/md", 1)
+ * @example Storage::GetDeviceName("/dev/system", "root")
+ */
+ global string GetDeviceName(string disk, any partition)
+ {
+ string ret = disk;
+ if (is(partition, integer))
+ {
+ ret = LibStorage::StorageInterface::getPartitionName(sint, disk, (integer) partition);
+ }
+ else if (size((string) partition ) > 0)
+ {
+ ret = ret + "/" + (string) partition;
+ }
+ return ret;
+ }
+
+
global define map