Hello community,
here is the log from the commit of package libstorage for openSUSE:Factory
checked in at Thu Jul 16 17:03:03 CEST 2009.
--------
--- libstorage/libstorage.changes 2009-07-09 15:41:42.000000000 +0200
+++ libstorage/libstorage.changes 2009-07-16 11:49:54.000000000 +0200
@@ -1,0 +2,12 @@
+Thu Jul 16 10:55:04 CEST 2009 - aschnell@suse.de
+
+- support naming of mmcblk devices (fate #305312)
+- added getPartitionName() to interface
+- 2.18.18
+
+-------------------------------------------------------------------
+Wed Jul 15 15:42:49 CEST 2009 - aschnell@suse.de
+
+- use "Arial" in storage graph (see bnc #508092)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libstorage-2.18.17.tar.bz2
New:
----
libstorage-2.18.18.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libstorage.spec ++++++
--- /var/tmp/diff_new_pack.Wq08rg/_old 2009-07-16 17:01:13.000000000 +0200
+++ /var/tmp/diff_new_pack.Wq08rg/_new 2009-07-16 17:01:13.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libstorage (Version 2.18.17)
+# spec file for package libstorage (Version 2.18.18)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,9 +19,9 @@
Name: libstorage
-Version: 2.18.17
+Version: 2.18.18
Release: 1
-License: GPL v2 or later
+License: GPL
Group: System/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: libstorage-%{version}.tar.bz2
@@ -90,7 +90,7 @@
/sbin/ldconfig
%package devel
-License: GPL v2 or later
+License: GPL
Requires: libstorage = %version
Requires: gcc-c++ libstdc++-devel boost-devel blocxx-devel
Summary: Header files and documentation for libstorage
@@ -130,5 +130,4 @@
%defattr(-,root,root)
%{_libdir}/python%{py_ver}/site-packages/libstorage.py*
%attr(755,root,root) %{_libdir}/python%{py_ver}/site-packages/_libstorage.so
-
%changelog
++++++ libstorage-2.18.17.tar.bz2 -> libstorage-2.18.18.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.18.17/VERSION new/libstorage-2.18.18/VERSION
--- old/libstorage-2.18.17/VERSION 2009-07-09 15:33:15.000000000 +0200
+++ new/libstorage-2.18.18/VERSION 2009-07-16 10:54:55.000000000 +0200
@@ -1 +1 @@
-2.18.17
+2.18.18
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.18.17/storage/Container.cc new/libstorage-2.18.18/storage/Container.cc
--- old/libstorage-2.18.17/storage/Container.cc 2009-07-07 10:13:01.000000000 +0200
+++ new/libstorage-2.18.18/storage/Container.cc 2009-07-13 11:57:36.000000000 +0200
@@ -121,7 +121,11 @@
{
case DECREASE:
if( vol->deleted() )
+ {
+ if (vol->getEncryption() != ENC_NONE)
+ vol->doFstabUpdate();
ret = doRemove( vol );
+ }
else if( vol->needShrink() )
ret = doResize( vol );
break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.18.17/storage/Disk.cc new/libstorage-2.18.18/storage/Disk.cc
--- old/libstorage-2.18.17/storage/Disk.cc 2009-06-16 12:57:48.000000000 +0200
+++ new/libstorage-2.18.18/storage/Disk.cc 2009-07-16 11:11:11.000000000 +0200
@@ -1002,22 +1002,19 @@
#undef PB
-string Disk::p_disks [] = { "cciss/", "ida/", "ataraid/", "etherd/", "rd/" };
+ string Disk::p_disks [] = { "cciss/", "ida/", "ataraid/", "etherd/", "rd/", "mmcblk[0-9]+" };
-bool Disk::needP( const string& disk )
+
+ bool
+ Disk::needP(const string& disk)
{
- bool need_p = false;
- unsigned i=0;
- while( !need_p && ilvmLvPair();
Storage::ConstDmraidCoPair dmrco = getStorage()->dmraidCoPair();
@@ -205,9 +215,11 @@
skip = true;
getStorage()->setDmcryptData( it->first, m->device(), min_num,
m->sizeK(), detectEncryption (m->device()) );
- getStorage()->clearUsedBy(it->first);
+ if (getStorage()->usedBy(it->first) == UB_DM)
+ getStorage()->clearUsedBy(it->first);
}
- if( !skip && m->sizeK()>0 )
+ if (!skip && m->sizeK() > 0 && ((only_crypt && m->getTargetName() == "crypt") ||
+ (!only_crypt && m->getTargetName() != "crypt")))
addDm( m );
else
delete( m );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.18.17/storage/DmCo.h new/libstorage-2.18.18/storage/DmCo.h
--- old/libstorage-2.18.17/storage/DmCo.h 2009-06-16 12:57:48.000000000 +0200
+++ new/libstorage-2.18.18/storage/DmCo.h 2009-07-14 10:58:22.000000000 +0200
@@ -13,9 +13,13 @@
friend class Storage;
public:
- DmCo( Storage * const s, bool detect, ProcPart& ppart );
+ DmCo(Storage * const s, bool detect, ProcPart& ppart, bool only_crypt);
DmCo( const DmCo& rhs );
+
+ void second(bool detect, ProcPart& ppart, bool only_crypt);
+
virtual ~DmCo();
+
static storage::CType staticType() { return storage::DM; }
friend std::ostream& operator<< (std::ostream&, const DmCo& );
bool equalContent( const Container& rhs ) const;
@@ -28,7 +32,7 @@
protected:
DmCo( Storage * const s, const string& File );
- void getDmData( ProcPart& ppart );
+ void getDmData(ProcPart& ppart, bool only_crypt);
bool findDm( unsigned num, DmIter& i );
bool findDm( unsigned num );
bool findDm( const string& dev, DmIter& i );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.18.17/storage/EtcFstab.cc new/libstorage-2.18.18/storage/EtcFstab.cc
--- old/libstorage-2.18.17/storage/EtcFstab.cc 2009-06-17 14:55:59.000000000 +0200
+++ new/libstorage-2.18.18/storage/EtcFstab.cc 2009-07-13 14:11:14.000000000 +0200
@@ -41,12 +41,10 @@
ifstream mounts( file.c_str() );
classic(mounts);
string line;
- unsigned lineno = 0;
getline( mounts, line );
while( mounts.good() )
{
y2mil( "line:\"" << line << "\"" );
- lineno++;
list<string> l = splitString( line );
list<string>::const_iterator i = l.begin();
if( l.begin()!=l.end() && i->find( '#' )!=0 )
@@ -81,9 +79,7 @@
getline( mounts, line );
}
mounts.close();
- y2mil("file:" << file << " lines:" << lineno);
- lineno=0;
file = prefix+"/cryptotab";
mounts.clear();
mounts.open( file.c_str() );
@@ -91,7 +87,6 @@
while( mounts.good() )
{
y2mil( "line:\"" << line << "\"" );
- lineno++;
list<string> l = splitString( line );
list<string>::const_iterator i = l.begin();
Entry *p = new Entry;
@@ -120,9 +115,7 @@
getline( mounts, line );
}
mounts.close();
- y2mil("file:" << file << " lines:" << lineno);
- lineno=0;
file = prefix+"/crypttab";
mounts.clear();
mounts.open( file.c_str() );
@@ -130,7 +123,6 @@
while( mounts.good() )
{
y2mil( "line:\"" << line << "\"" );
- lineno++;
list<string> l = splitString( line );
if( l.size()>=3 )
{
@@ -146,6 +138,7 @@
{
co.push_back( Entry() );
p = &(co.back());
+ p->old.dentry = *i;
}
else
p = &(*e);
@@ -177,7 +170,6 @@
getline( mounts, line );
}
mounts.close();
- y2mil("file:" << file << " lines:" << lineno);
y2mil("entries:" << co.size());
}
@@ -665,14 +657,20 @@
int lineno;
cur = findFile( i->old, fstab, cryptotab, lineno );
if( lineno>=0 )
- {
+ {
cur->remove( lineno, 1 );
if( cur==fstab && i->old.crypttab &&
findCrtab( i->old, crypttab, lineno ))
crypttab.remove( lineno, 1 );
- }
+ }
+ else if (i->old.crypttab && findCrtab(i->old, crypttab, lineno))
+ {
+ crypttab.remove( lineno, 1 );
+ }
else
+ {
ret = FSTAB_REMOVE_ENTRY_NOT_FOUND;
+ }
i = co.erase( i );
} break;
@@ -737,10 +735,14 @@
if( lineno>=0 )
{
before_dev = extractNthWord( 0, (*cur)[lineno] );
- cur->insert( lineno, line );
+ if (!i->nnew.mount.empty())
+ cur->insert( lineno, line );
}
else
- cur->append( line );
+ {
+ if (!i->nnew.mount.empty())
+ cur->append( line );
+ }
}
else
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.18.17/storage/Graph.cc new/libstorage-2.18.18/storage/Graph.cc
--- old/libstorage-2.18.17/storage/Graph.cc 2009-06-16 12:57:48.000000000 +0200
+++ new/libstorage-2.18.18/storage/Graph.cc 2009-07-15 15:45:42.000000000 +0200
@@ -372,7 +372,7 @@
out << "digraph storage" << endl;
out << "{" << endl;
- out << " node [shape=rectangle, style=filled, fontname=\"DejaVu Sans\"];" << endl;
+ out << " node [shape=rectangle, style=filled, fontname=\"Arial\"];" << endl;
out << endl;
for (list<Node>::const_iterator node = nodes.begin(); node != nodes.end(); ++node)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.18.17/storage/Lock.h new/libstorage-2.18.18/storage/Lock.h
--- old/libstorage-2.18.17/storage/Lock.h 2009-06-16 12:57:48.000000000 +0200
+++ new/libstorage-2.18.18/storage/Lock.h 2009-07-15 14:45:47.000000000 +0200
@@ -39,7 +39,7 @@
private:
- bool disabled;
+ const bool disabled;
int fd;
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.18.17/storage/Storage.cc new/libstorage-2.18.18/storage/Storage.cc
--- old/libstorage-2.18.17/storage/Storage.cc 2009-07-08 15:27:12.000000000 +0200
+++ new/libstorage-2.18.18/storage/Storage.cc 2009-07-16 10:39:17.000000000 +0200
@@ -238,8 +238,9 @@
detectDmraid(ppart);
detectDmmultipath(ppart);
detectMds();
+ detectDm(ppart, true);
detectLvmVgs();
- detectDm(ppart);
+ detectDm(ppart, false);
if (!danglingUsedBy.empty())
y2err("dangling used-by left after detection: " << danglingUsedBy);
@@ -563,7 +564,7 @@
void
-Storage::detectDm( ProcPart& ppart )
+Storage::detectDm(ProcPart& ppart, bool only_crypt)
{
if (testmode())
{
@@ -577,14 +578,22 @@
}
else if (autodetect() && getenv("LIBSTORAGE_NO_DM") == NULL)
{
- DmCo * v = new DmCo( this, true, ppart );
- if( !v->isEmpty() )
+ DmCo* v = NULL;
+ if (haveDm(v))
{
- addToList( v );
- v->updateDmMaps();
+ v->second(true, ppart, only_crypt);
+ }
+ else
+ {
+ v = new DmCo(this, true, ppart, only_crypt);
+ if (!v->isEmpty() )
+ {
+ addToList( v );
+ v->updateDmMaps();
+ }
+ else
+ delete v;
}
- else
- delete v;
}
}
@@ -1637,6 +1646,13 @@
}
+ string
+ Storage::getPartitionName(const string& disk, int partition_no)
+ {
+ return disk + Disk::partNaming(disk) + decString(partition_no);
+ }
+
+
int
Storage::getUnusedPartitionSlots(const string& disk, list<PartitionSlotInfo>& slots)
{
@@ -3289,6 +3305,21 @@
return( i != p.end() );
}
+
+ bool
+ Storage::haveDm(DmCo*& dm)
+ {
+ dm = NULL;
+ CPair p = cPair();
+ ContIterator i = p.begin();
+ while (i != p.end() && i->type() != DM)
+ ++i;
+ if (i != p.end())
+ dm = static_cast(&(*i));
+ return i != p.end();
+ }
+
+
bool Storage::haveNfs( NfsCo*& co )
{
co = NULL;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.18.17/storage/Storage.h new/libstorage-2.18.18/storage/Storage.h
--- old/libstorage-2.18.17/storage/Storage.h 2009-06-16 12:57:48.000000000 +0200
+++ new/libstorage-2.18.18/storage/Storage.h 2009-07-16 10:31:40.000000000 +0200
@@ -329,6 +329,7 @@
int removePartition( const string& partition );
int changePartitionId( const string& partition, unsigned id );
int forgetChangePartitionId( const string& partition );
+ string getPartitionName(const string& disk, int partition_no);
int getUnusedPartitionSlots(const string& disk, list<PartitionSlotInfo>& slots);
int destroyPartitionTable( const string& disk, const string& label );
int initializeDisk( const string& disk, bool value );
@@ -1655,7 +1656,7 @@
void detectLvmVgs();
void detectDmraid( ProcPart& ppart );
void detectDmmultipath( ProcPart& ppart );
- void detectDm( ProcPart& ppart );
+ void detectDm(ProcPart& ppart, bool only_crypt);
void initDisk( DiskData& data, ProcPart& pp );
void detectFsData( const VolIterator& begin, const VolIterator& end,
ProcMounts& mounts );
@@ -1682,6 +1683,7 @@
bool findContainer( const string& device, ContIterator& c );
bool haveMd( MdCo*& md );
+ bool haveDm(DmCo*& dm);
bool haveNfs( NfsCo*& co );
bool haveLoop( LoopCo*& loop );
int removeContainer( Container* val );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.18.17/storage/StorageInterface.h new/libstorage-2.18.18/storage/StorageInterface.h
--- old/libstorage-2.18.17/storage/StorageInterface.h 2009-06-16 12:57:48.000000000 +0200
+++ new/libstorage-2.18.18/storage/StorageInterface.h 2009-07-16 10:48:08.000000000 +0200
@@ -1079,6 +1079,16 @@
virtual int forgetChangePartitionId (const string& partition ) = 0;
/**
+ * Construct the device name for a partiton from the disk name and
+ * partiton number.
+ *
+ * @param disk name of disk, e.g. /dev/sda
+ * @param partition_no number of partition, e.g. 1
+ * @return device name of partition, e.g. /dev/sda1
+ */
+ virtual string getPartitionName(const string& disk, int partition_no) = 0;
+
+ /**
* Query unused slots on a disk suitable for creating partitions.
*
* This functions ignores size limitations of the partition table type,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.18.17/storage/Volume.cc new/libstorage-2.18.18/storage/Volume.cc
--- old/libstorage-2.18.17/storage/Volume.cc 2009-06-19 14:13:47.000000000 +0200
+++ new/libstorage-2.18.18/storage/Volume.cc 2009-07-13 14:11:29.000000000 +0200
@@ -1957,6 +1957,10 @@
if( ret!=0 && losetup_done )
loUnsetup();
}
+ if (ret == 0 && encryption != ENC_NONE)
+ {
+ doFstabUpdate();
+ }
if( ret==0 )
updateFsData();
y2mil("ret:" << ret);
@@ -2397,11 +2401,12 @@
{
EtcFstab* fstab = cont->getStorage()->getFstab();
FstabEntry entry;
- if( !orig_mp.empty() && (deleted()||mp.empty()) &&
- (fstab->findDevice( dev, entry ) ||
- fstab->findDevice( alt_names, entry ) ||
- (cType()==LOOP && fstab->findMount( orig_mp, entry )) ||
- (cType()==LOOP && fstab->findMount( mp, entry )) ))
+ if ((!orig_mp.empty() || orig_encryption != ENC_NONE) &&
+ (deleted() || (mp.empty() && encryption == ENC_NONE)) &&
+ (fstab->findDevice( dev, entry ) ||
+ fstab->findDevice( alt_names, entry ) ||
+ (cType()==LOOP && fstab->findMount( orig_mp, entry )) ||
+ (cType()==LOOP && fstab->findMount( mp, entry )) ))
{
changed = true;
if( !silent() )
@@ -2412,7 +2417,7 @@
y2mil("before removeEntry");
ret = fstab->removeEntry( entry );
}
- else if( !mp.empty() && !deleted() )
+ else if ((!mp.empty() || encryption != ENC_NONE) && !deleted())
{
string fname;
if( fstab->findDevice( dev, entry ) ||
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.18.17/testsuite/Makefile.am new/libstorage-2.18.18/testsuite/Makefile.am
--- old/libstorage-2.18.17/testsuite/Makefile.am 2009-06-16 12:57:48.000000000 +0200
+++ new/libstorage-2.18.18/testsuite/Makefile.am 2009-07-16 10:37:15.000000000 +0200
@@ -14,7 +14,7 @@
noinst_PROGRAMS = partition1.single format1.single uuid1.single fstab1.single \
lvm_create.single lvm_extend.single md_create.single \
- humanstring1.single humanstring2.single
+ humanstring1.single humanstring2.single partitionname.single
partition1_single_SOURCES = partition1.cc common.h
@@ -34,5 +34,7 @@
humanstring2_single_SOURCES = humanstring2.cc
+partitionname_single_SOURCES = partitionname.cc
+
clean-local:
rm -f tmp.err.* tmp.out.* site.exp site.bak
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.18.17/testsuite/Makefile.in new/libstorage-2.18.18/testsuite/Makefile.in
--- old/libstorage-2.18.17/testsuite/Makefile.in 2009-07-11 09:36:13.000000000 +0200
+++ new/libstorage-2.18.18/testsuite/Makefile.in 2009-07-16 11:48:42.000000000 +0200
@@ -40,7 +40,7 @@
uuid1.single$(EXEEXT) fstab1.single$(EXEEXT) \
lvm_create.single$(EXEEXT) lvm_extend.single$(EXEEXT) \
md_create.single$(EXEEXT) humanstring1.single$(EXEEXT) \
- humanstring2.single$(EXEEXT)
+ humanstring2.single$(EXEEXT) partitionname.single$(EXEEXT)
subdir = testsuite
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -83,6 +83,10 @@
partition1_single_OBJECTS = $(am_partition1_single_OBJECTS)
partition1_single_LDADD = $(LDADD)
partition1_single_DEPENDENCIES = ../storage/libstorage.la
+am_partitionname_single_OBJECTS = partitionname.$(OBJEXT)
+partitionname_single_OBJECTS = $(am_partitionname_single_OBJECTS)
+partitionname_single_LDADD = $(LDADD)
+partitionname_single_DEPENDENCIES = ../storage/libstorage.la
am_uuid1_single_OBJECTS = uuid1.$(OBJEXT)
uuid1_single_OBJECTS = $(am_uuid1_single_OBJECTS)
uuid1_single_LDADD = $(LDADD)
@@ -112,12 +116,12 @@
$(humanstring1_single_SOURCES) $(humanstring2_single_SOURCES) \
$(lvm_create_single_SOURCES) $(lvm_extend_single_SOURCES) \
$(md_create_single_SOURCES) $(partition1_single_SOURCES) \
- $(uuid1_single_SOURCES)
+ $(partitionname_single_SOURCES) $(uuid1_single_SOURCES)
DIST_SOURCES = $(format1_single_SOURCES) $(fstab1_single_SOURCES) \
$(humanstring1_single_SOURCES) $(humanstring2_single_SOURCES) \
$(lvm_create_single_SOURCES) $(lvm_extend_single_SOURCES) \
$(md_create_single_SOURCES) $(partition1_single_SOURCES) \
- $(uuid1_single_SOURCES)
+ $(partitionname_single_SOURCES) $(uuid1_single_SOURCES)
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
install-dvi-recursive install-exec-recursive \
@@ -273,6 +277,7 @@
md_create_single_SOURCES = md_create.cc common.h
humanstring1_single_SOURCES = humanstring1.cc
humanstring2_single_SOURCES = humanstring2.cc
+partitionname_single_SOURCES = partitionname.cc
all: all-recursive
.SUFFIXES:
@@ -337,6 +342,9 @@
partition1.single$(EXEEXT): $(partition1_single_OBJECTS) $(partition1_single_DEPENDENCIES)
@rm -f partition1.single$(EXEEXT)
$(CXXLINK) $(partition1_single_OBJECTS) $(partition1_single_LDADD) $(LIBS)
+partitionname.single$(EXEEXT): $(partitionname_single_OBJECTS) $(partitionname_single_DEPENDENCIES)
+ @rm -f partitionname.single$(EXEEXT)
+ $(CXXLINK) $(partitionname_single_OBJECTS) $(partitionname_single_LDADD) $(LIBS)
uuid1.single$(EXEEXT): $(uuid1_single_OBJECTS) $(uuid1_single_DEPENDENCIES)
@rm -f uuid1.single$(EXEEXT)
$(CXXLINK) $(uuid1_single_OBJECTS) $(uuid1_single_LDADD) $(LIBS)
@@ -355,6 +363,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lvm_extend.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md_create.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/partition1.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/partitionname.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uuid1.Po@am__quote@
.cc.o:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.18.17/testsuite/partitionname.cc new/libstorage-2.18.18/testsuite/partitionname.cc
--- old/libstorage-2.18.17/testsuite/partitionname.cc 1970-01-01 01:00:00.000000000 +0100
+++ new/libstorage-2.18.18/testsuite/partitionname.cc 2009-07-16 10:59:37.000000000 +0200
@@ -0,0 +1,28 @@
+
+#include
+#include <iostream>
+
+#include
+
+#include "common.h"
+
+
+using namespace std;
+using namespace storage;
+
+
+StorageInterface* s = 0;
+
+
+int
+main(int argc, char* argv[])
+{
+ s = createStorageInterface(TestEnvironment());
+
+ cout << s->getPartitionName("/dev/sda", 1) << endl;
+ cout << s->getPartitionName("/dev/cciss/c0d1", 2) << endl;
+ cout << s->getPartitionName("/dev/mmcblk0", 3) << endl;
+ cout << s->getPartitionName("/dev/mapper/isw_cfcjajfdfh_test", 4) << endl;
+
+ delete s;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.18.17/testsuite/single.out/partitionname.out new/libstorage-2.18.18/testsuite/single.out/partitionname.out
--- old/libstorage-2.18.17/testsuite/single.out/partitionname.out 1970-01-01 01:00:00.000000000 +0100
+++ new/libstorage-2.18.18/testsuite/single.out/partitionname.out 2009-07-16 10:44:11.000000000 +0200
@@ -0,0 +1,4 @@
+/dev/sda1
+/dev/cciss/c0d1p2
+/dev/mmcblk0p3
+/dev/mapper/isw_cfcjajfdfh_test_part4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org