Hello community,
here is the log from the commit of package yast2-storage
checked in at Tue Apr 25 21:57:13 CEST 2006.
--------
--- yast2-storage/yast2-storage.changes 2006-04-24 17:45:52.000000000 +0200
+++ STABLE/yast2-storage/yast2-storage.changes 2006-04-25 12:05:22.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Apr 25 12:02:54 CEST 2006 - fehr@suse.de
+
+- do not prefer edd links in udev id (#169040)
+- cope with obsolete entries in by-uuid and by-label
+- version 2.13.55
+
+-------------------------------------------------------------------
Old:
----
yast2-storage-2.13.54.tar.bz2
New:
----
yast2-storage-2.13.55.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.fMej8D/_old 2006-04-25 21:57:00.000000000 +0200
+++ /var/tmp/diff_new_pack.fMej8D/_new 2006-04-25 21:57:00.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.13.54)
+# spec file for package yast2-storage (Version 2.13.55)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-storage
-Version: 2.13.54
+Version: 2.13.55
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.13.54.tar.bz2
+Source0: yast2-storage-2.13.55.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-devtools yast2-installation yast2-perl-bindings yast2-testsuite
Requires: yast2 parted yast2-installation yast2-storage-lib yast2-perl-bindings
@@ -40,7 +40,7 @@
%prep
-%setup -n yast2-storage-2.13.54
+%setup -n yast2-storage-2.13.55
%build
%{prefix}/bin/y2tool y2autoconf
@@ -164,6 +164,10 @@
%doc %{prefix}/share/doc/packages/yast2-storage/libstorage
%changelog -n yast2-storage
+* Tue Apr 25 2006 - fehr@suse.de
+- do not prefer edd links in udev id (#169040)
+- cope with obsolete entries in by-uuid and by-label
+- version 2.13.55
* Mon Apr 24 2006 - fehr@suse.de
- fix problem with no valid evms devices at start (#167397)
- fix handlong of non-CDL formatted dasds (#164930)
++++++ yast2-storage-2.13.54.tar.bz2 -> yast2-storage-2.13.55.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.54/VERSION new/yast2-storage-2.13.55/VERSION
--- old/yast2-storage-2.13.54/VERSION 2006-04-24 14:55:16.000000000 +0200
+++ new/yast2-storage-2.13.55/VERSION 2006-04-25 12:03:55.000000000 +0200
@@ -1 +1 @@
-2.13.54
+2.13.55
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.54/libstorage/src/AppUtil.cc new/yast2-storage-2.13.55/libstorage/src/AppUtil.cc
--- old/yast2-storage-2.13.54/libstorage/src/AppUtil.cc 2006-03-30 20:01:12.000000000 +0200
+++ new/yast2-storage-2.13.55/libstorage/src/AppUtil.cc 2006-04-25 12:01:03.000000000 +0200
@@ -578,15 +578,14 @@
y2mil( "map: " << m );
}
-void getFindRevMap( const char* path, map& m )
+void getFindRevMap( const char* path, map& ret )
{
y2mil( "path: " << path );
- m.clear();
+ map m;
if( access( path, R_OK )==0 )
{
- string cmd = "/usr/bin/find ";
+ string cmd = "/bin/ls -lt ";
cmd += path;
- cmd += " -type l -printf '%f %l\n'";
SystemCmd findcmd( cmd.c_str() );
list<string> l;
findcmd.getStdout( l );
@@ -594,15 +593,40 @@
while( i!=l.end() )
{
list<string> tlist = splitString( *i );
- if( tlist.size()==2 )
+ string dev, id;
+ y2mil( "tlist:" << tlist );
+ if( !tlist.empty() )
{
- string& tmp = tlist.back();
- m[tlist.front()] = tmp.substr( tmp.find_first_not_of( "./" ) );
+ dev = tlist.back();
+ tlist.pop_back();
+ dev.erase( 0, dev.find_first_not_of( "./" ) );
+ if( !tlist.empty() && tlist.back() == "->" )
+ {
+ tlist.pop_back();
+ if( !tlist.empty() )
+ id = tlist.back();
+ }
+ if( !id.empty() && !dev.empty() )
+ {
+ map::iterator mi = m.find( dev );
+ if( mi == m.end() )
+ {
+ m[dev] = id;
+ }
+ else
+ y2mil( "already here dev:" << mi->first <<
+ " id:" << mi->second );
+ }
}
++i;
}
+ ret.clear();
+ for( map::iterator mi = m.begin(); mi!=m.end(); ++mi )
+ {
+ ret[mi->second] = mi->first;
+ }
}
- y2mil( "map: " << m );
+ y2mil( "map: " << ret );
}
bool system_cmd_testmode = false;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.54/libstorage/src/Disk.cc new/yast2-storage-2.13.55/libstorage/src/Disk.cc
--- old/yast2-storage-2.13.54/libstorage/src/Disk.cc 2006-04-18 12:23:00.000000000 +0200
+++ new/yast2-storage-2.13.55/libstorage/src/Disk.cc 2006-04-25 11:34:40.000000000 +0200
@@ -162,18 +162,18 @@
void Disk::setUdevData( const string& path, const string& id )
{
- y2milestone( "disk %s id %s path %s", nm.c_str(), path.c_str(), id.c_str() );
+ y2milestone( "disk %s path %s id %s", nm.c_str(), path.c_str(), id.c_str() );
udev_path = path;
udev_id.clear();
- list<string> tmp = splitString( id );
- list<string>::iterator i = find_if( tmp.begin(), tmp.end(),
- find_begin( "edd_" ) );
- if( i!=tmp.end() )
+ udev_id = splitString( id );
+ list<string>::iterator i = find_if( udev_id.begin(), udev_id.end(),
+ find_begin( "edd-" ) );
+ if( i!=udev_id.end() )
{
udev_id.push_back( *i );
- tmp.erase( i );
+ udev_id.erase( i );
}
- udev_id.splice( udev_id.end(), tmp );
+ y2mil( "id:" << udev_id );
PartPair pp = partPair();
for( PartIter p=pp.begin(); p!=pp.end(); ++p )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.54/libstorage/src/Storage.cc new/yast2-storage-2.13.55/libstorage/src/Storage.cc
--- old/yast2-storage-2.13.54/libstorage/src/Storage.cc 2006-04-24 17:04:40.000000000 +0200
+++ new/yast2-storage-2.13.55/libstorage/src/Storage.cc 2006-04-25 11:14:51.000000000 +0200
@@ -486,7 +486,6 @@
s << d.name << "," << d.typ << "," << d.s << "," << d.d;
if( !d.dev.empty() && d.dev!=d.name )
s << "," << d.dev;
- s << "," << d.typ << "," << d.s << "," << d.d;
return( s );
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.54/storage/src/inst_lvm_pv.ycp new/yast2-storage-2.13.55/storage/src/inst_lvm_pv.ycp
--- old/yast2-storage-2.13.54/storage/src/inst_lvm_pv.ycp 2006-04-03 18:28:14.000000000 +0200
+++ new/yast2-storage-2.13.55/storage/src/inst_lvm_pv.ycp 2006-04-24 19:08:36.000000000 +0200
@@ -14,7 +14,7 @@
*
*
*
- * $Id: inst_lvm_pv.ycp 26548 2005-12-15 16:37:09Z fehr $
+ * $Id: inst_lvm_pv.ycp 30425 2006-04-24 17:08:34Z fehr $
*
*
*----------------------------------------------------
@@ -133,7 +133,7 @@
ret = (symbol)Wizard::UserInput();
- y2milestone("#################### EE %1", ret);
+ y2milestone("#################### EE %1 vg:%2", ret, current_vg);
////////////////////////////////////////
@@ -224,6 +224,7 @@
if( ret == `pv_delete && current_vg != nil )
{
id = (string)UI::QueryWidget(`id(`pv_table), `CurrentItem);
+ y2milestone( "id:%1", id );
if( id!=nil && CheckItemIsPv(targetMap,id) )
{
@@ -233,7 +234,7 @@
else
vg = Storage::GetPartition( targetMap, id )["used_by"]:"";
vg = lvmVg(vg);
- y2debug( "vg=%1", vg );
+ y2milestone( "vg=%1", vg );
if( !check_pv_delete( targetMap, id, vg ) )
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...