Hello community,
here is the log from the commit of package libstorage for openSUSE:Factory
checked in at Tue Jun 16 18:27:17 CEST 2009.
--------
--- libstorage/libstorage.changes 2009-06-10 17:13:54.000000000 +0200
+++ /mounts/work_src_done/STABLE/libstorage/libstorage.changes 2009-06-16 13:46:18.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Jun 16 10:36:13 CEST 2009 - aschnell@suse.de
+
+- automake 1.11 fix
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libstorage.spec ++++++
--- /var/tmp/diff_new_pack.Ab9316/_old 2009-06-16 18:27:01.000000000 +0200
+++ /var/tmp/diff_new_pack.Ab9316/_new 2009-06-16 18:27:01.000000000 +0200
@@ -20,7 +20,7 @@
Name: libstorage
Version: 2.18.16
-Release: 2
+Release: 3
License: GPL v2 or later
Group: System/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -63,7 +63,7 @@
%endif
%check
-make check
+LOCALEDIR=$RPM_BUILD_ROOT/usr/share/locale make check
%install
make install DESTDIR="$RPM_BUILD_ROOT"
@@ -139,6 +139,8 @@
%{_libdir}/python%{py_ver}/site-packages/libstorage.py*
%attr(755,root,root) %{_libdir}/python%{py_ver}/site-packages/_libstorage.so
%changelog
+* Tue Jun 16 2009 aschnell@suse.de
+- automake 1.11 fix
* Wed Jun 10 2009 aschnell@suse.de
- added python bindings
* Wed Jun 10 2009 aschnell@suse.de
++++++ libstorage-2.18.16.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libstorage-2.18.16/doc/autodocs/Makefile.am new/libstorage-2.18.16/doc/autodocs/Makefile.am
--- old/libstorage-2.18.16/doc/autodocs/Makefile.am 2009-06-03 23:32:05.000000000 +0200
+++ new/libstorage-2.18.16/doc/autodocs/Makefile.am 2009-06-16 12:09:56.000000000 +0200
@@ -4,7 +4,7 @@
htmldir = $(docdir)/autodocs
-html_DATA = index.html $(wildcard *.html *.png)
+html_DATA = index.html $(filter-out index.html, $(wildcard *.html *.png))
index.html: $(srcdir)/../../storage/*.h
doxygen doxygen.conf
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libstorage-2.18.16/doc/autodocs/Makefile.in new/libstorage-2.18.16/doc/autodocs/Makefile.in
--- old/libstorage-2.18.16/doc/autodocs/Makefile.in 2009-06-12 14:14:14.000000000 +0200
+++ new/libstorage-2.18.16/doc/autodocs/Makefile.in 2009-06-16 13:45:17.000000000 +0200
@@ -182,7 +182,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-html_DATA = index.html $(wildcard *.html *.png)
+html_DATA = index.html $(filter-out index.html, $(wildcard *.html *.png))
CLEANFILES = $(html_DATA) doxygen.log installdox
EXTRA_DIST = doxygen.conf
all: all-am
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libstorage-2.18.16/libstorage.spec.in new/libstorage-2.18.16/libstorage.spec.in
--- old/libstorage-2.18.16/libstorage.spec.in 2009-06-10 17:34:12.000000000 +0200
+++ new/libstorage-2.18.16/libstorage.spec.in 2009-06-16 12:36:37.000000000 +0200
@@ -48,7 +48,7 @@
%endif
%check
-make check
+LOCALEDIR=$RPM_BUILD_ROOT/usr/share/locale make check
%install
make install DESTDIR="$RPM_BUILD_ROOT"
@@ -99,7 +99,7 @@
%package python
Requires: libstorage = %version
Summary: -
-Group: Development/Languages/Python
+Group: System/Libraries
%description python
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libstorage-2.18.16/po/de.po new/libstorage-2.18.16/po/de.po
--- old/libstorage-2.18.16/po/de.po 2009-06-10 12:35:26.000000000 +0200
+++ new/libstorage-2.18.16/po/de.po 2009-06-16 12:37:16.000000000 +0200
@@ -1454,4 +1454,4 @@
#. symbol for "kilo bytes" (best keep untranslated)
#: ../src/HumanString.cc:37
msgid "kB"
-msgstr "KB"
+msgstr "kB"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libstorage-2.18.16/storage/Container.h new/libstorage-2.18.16/storage/Container.h
--- old/libstorage-2.18.16/storage/Container.h 2009-06-03 14:34:33.000000000 +0200
+++ new/libstorage-2.18.16/storage/Container.h 2009-06-16 12:09:56.000000000 +0200
@@ -145,7 +145,7 @@
void setSilent( bool val=true ) { silent=val; }
void clearUsedBy() { uby.clear(); }
- void setUsedBy(storage::UsedByType ub_type, const string& ub_name) { uby.set(ub_type, ub_name); }
+ void setUsedBy(storage::UsedByType ub_type, const string& ub_device) { uby.set(ub_type, ub_device); }
const storage::usedBy& getUsedBy() const { return uby; }
storage::UsedByType getUsedByType() const { return uby.type(); }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libstorage-2.18.16/storage/DmCo.cc new/libstorage-2.18.16/storage/DmCo.cc
--- old/libstorage-2.18.16/storage/DmCo.cc 2009-06-03 14:34:33.000000000 +0200
+++ new/libstorage-2.18.16/storage/DmCo.cc 2009-06-16 12:09:56.000000000 +0200
@@ -191,7 +191,7 @@
if( !getStorage()->canUseDevice( it->first, true ))
in_use = true;
if( !in_use || multipath )
- getStorage()->setUsedBy( it->first, UB_DM, table );
+ getStorage()->setUsedBy(it->first, UB_DM, "/dev/mapper/" + table);
}
string tmp = m->device();
tmp.erase( 5, 7 );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libstorage-2.18.16/storage/DmmultipathCo.cc new/libstorage-2.18.16/storage/DmmultipathCo.cc
--- old/libstorage-2.18.16/storage/DmmultipathCo.cc 2009-06-03 14:34:33.000000000 +0200
+++ new/libstorage-2.18.16/storage/DmmultipathCo.cc 2009-06-16 12:09:56.000000000 +0200
@@ -116,7 +116,7 @@
{
PeContainer::addPv(*p);
if (!deleted())
- getStorage()->setUsedBy(p->device, UB_DMMULTIPATH, name());
+ getStorage()->setUsedBy(p->device, UB_DMMULTIPATH, "/dev/mapper/" + name());
delete p;
p = new Pv;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libstorage-2.18.16/storage/DmraidCo.cc new/libstorage-2.18.16/storage/DmraidCo.cc
--- old/libstorage-2.18.16/storage/DmraidCo.cc 2009-06-03 14:34:33.000000000 +0200
+++ new/libstorage-2.18.16/storage/DmraidCo.cc 2009-06-16 12:09:56.000000000 +0200
@@ -102,7 +102,7 @@
{
PeContainer::addPv( *p );
if( !deleted() )
- getStorage()->setUsedBy( p->device, UB_DMRAID, name() );
+ getStorage()->setUsedBy(p->device, UB_DMRAID, "/dev/mapper/" + name());
delete p;
p = new Pv;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libstorage-2.18.16/storage/EtcFstab.cc new/libstorage-2.18.16/storage/EtcFstab.cc
--- old/libstorage-2.18.16/storage/EtcFstab.cc 2009-06-03 14:34:33.000000000 +0200
+++ new/libstorage-2.18.16/storage/EtcFstab.cc 2009-06-16 12:28:12.000000000 +0200
@@ -346,7 +346,7 @@
int EtcFstab::removeEntry( const FstabEntry& entry )
{
- y2mil("dev:" << entry.dentry << " mp:" << entry.mount);
+ y2mil("dentry:" << entry.dentry << " mount:" << entry.mount);
list<Entry>::iterator i = co.begin();
while( i != co.end() &&
(i->op==Entry::REMOVE || i->nnew.device != entry.device) )
@@ -363,7 +363,7 @@
int EtcFstab::updateEntry( const FstabChange& entry )
{
- y2mil("dev:" << entry.dentry << " mp:" << entry.mount);
+ y2mil("dentry:" << entry.dentry << " mount:" << entry.mount);
list<Entry>::iterator i = co.begin();
bool found = false;
while( i != co.end() && !found )
@@ -388,7 +388,7 @@
int EtcFstab::addEntry( const FstabChange& entry )
{
- y2mil("dev:" << entry.dentry << " mp:" << entry.mount);
+ y2mil("dentry:" << entry.dentry << " mount:" << entry.mount);
Entry e;
e.op = Entry::ADD;
e.nnew = entry;
@@ -400,7 +400,8 @@
AsciiFile* EtcFstab::findFile( const FstabEntry& e, AsciiFile*& fstab,
AsciiFile*& cryptotab, int& lineno ) const
{
- y2mil("device:" << e.dentry << " mp:" << e.mount << " fstab:" << fstab << " cryptotab:" << cryptotab);
+ y2mil("dentry:" << e.dentry << " mount:" << e.mount << " fstab:" << fstab <<
+ " cryptotab:" << cryptotab);
AsciiFile* ret=NULL;
string reg;
if( e.crypto )
@@ -425,8 +426,7 @@
int EtcFstab::findPrefix( const AsciiFile& tab, const string& mount ) const
{
bool crypto = tab.name().find( "/cryptotab" )>=0;
- y2mil( "file:" << tab.name() << " mp:" << mount <<
- " crypto:" << crypto );
+ y2mil("file:" << tab.name() << " mount:" << mount << " crypto:" << crypto);
string reg = "^[ \t]*[^ \t]+";
if( crypto )
reg += "[ \t]+[^ \t]+";
@@ -463,9 +463,9 @@
return( lineno>=0 );
}
-void EtcFstab::makeStringList( const FstabEntry& e, list<string>& ls ) const
+ list<string> EtcFstab::makeStringList(const FstabEntry& e) const
{
- ls.clear();
+ list<string> ls;
if( e.crypto )
{
ls.push_back( e.loop_dev );
@@ -496,6 +496,7 @@
ls.push_back( decString(e.freq) );
ls.push_back( decString(e.passno) );
}
+ return ls;
}
string EtcFstab::createLine( const list<string>& ls, unsigned fields,
@@ -520,20 +521,17 @@
string EtcFstab::createTabLine( const FstabEntry& e ) const
{
- y2mil("device:" << e.dentry << " mp:" << e.mount);
- y2mil( "entry:" << e );
- list<string> ls;
- makeStringList( e, ls );
- y2mil( "list:" << ls );
+ y2mil("dentry:" << e.dentry << " mount:" << e.mount << "device:" << e.device);
+ const list<string> ls = makeStringList(e);
unsigned max_fields = e.crypto ? lengthof(cryptotabFields)
: lengthof(fstabFields);
unsigned* fields = e.crypto ? cryptotabFields : fstabFields;
- return( createLine( ls, max_fields, fields ));
+ return createLine(ls, max_fields, fields);
}
-void EtcFstab::makeCrStringList( const FstabEntry& e, list<string>& ls ) const
+ list<string> EtcFstab::makeCrStringList(const FstabEntry& e) const
{
- ls.clear();
+ list<string> ls;
ls.push_back( e.dentry.substr(e.dentry.rfind( '/' )+1) );
string tmp = e.device;
ls.push_back( tmp );
@@ -557,14 +555,14 @@
tls.erase(i);
tmp = boost::join( tls, "," );
ls.push_back( tmp.empty()?"none":tmp );
+ return ls;
}
string EtcFstab::createCrtabLine( const FstabEntry& e ) const
{
- y2mil("device:" << e.dentry << " mp:" << e.mount << " device:" << e.device);
- list<string> ls;
- makeCrStringList( e, ls );
- return( createLine( ls, lengthof(crypttabFields), crypttabFields ));
+ y2mil("dentry:" << e.dentry << " mount:" << e.mount << " device:" << e.device);
+ const list<string> ls = makeCrStringList(e);
+ return createLine(ls, lengthof(crypttabFields), crypttabFields);
}
@@ -693,9 +691,8 @@
else
{
line = (*cur)[lineno];
- list<string> ol, nl;
- makeStringList( i->nnew, nl );
- makeStringList( i->old, ol );
+ const list<string> nl = makeStringList(i->nnew);
+ const list<string> ol = makeStringList(i->old);
line = updateLine( ol, nl, line );
(*cur)[lineno] = line;
}
@@ -709,9 +706,8 @@
findCrtab( i->nnew, crypttab, lineno ))
{
line = crypttab[lineno];
- list<string> ol, nl;
- makeCrStringList( i->nnew, nl );
- makeCrStringList( i->old, ol );
+ const list<string> nl = makeCrStringList(i->nnew);
+ const list<string> ol = makeCrStringList(i->old);
line = updateLine( ol, nl, line );
crypttab[lineno] = line;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libstorage-2.18.16/storage/EtcFstab.h new/libstorage-2.18.16/storage/EtcFstab.h
--- old/libstorage-2.18.16/storage/EtcFstab.h 2009-06-03 14:34:33.000000000 +0200
+++ new/libstorage-2.18.16/storage/EtcFstab.h 2009-06-16 12:14:35.000000000 +0200
@@ -120,20 +120,23 @@
};
void readFiles();
+
AsciiFile* findFile( const FstabEntry& e, AsciiFile*& fstab,
AsciiFile*& cryptotab, int& lineno ) const;
bool findCrtab( const FstabEntry& e, const AsciiFile& crtab,
int& lineno ) const;
bool findCrtab( const string& device, const AsciiFile& crtab,
int& lineno ) const;
- void makeStringList( const FstabEntry& e, std::list<string>& ls ) const;
- void makeCrtabStringList( const FstabEntry& e, std::list<string>& ls ) const;
+
+ list<string> makeStringList(const FstabEntry& e) const;
+ list<string> makeCrStringList(const FstabEntry& e) const;
+
string updateLine( const std::list<string>& ol,
const std::list<string>& nl, const string& line ) const;
string createLine( const std::list<string>& ls, unsigned fields,
unsigned* flen ) const;
+
string createTabLine( const FstabEntry& e ) const;
- void makeCrStringList( const FstabEntry& e, std::list<string>& ls ) const;
string createCrtabLine( const FstabEntry& e ) const;
static unsigned fstabFields[6];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libstorage-2.18.16/storage/LvmVg.cc new/libstorage-2.18.16/storage/LvmVg.cc
--- old/libstorage-2.18.16/storage/LvmVg.cc 2009-06-03 14:34:33.000000000 +0200
+++ new/libstorage-2.18.16/storage/LvmVg.cc 2009-06-16 12:09:56.000000000 +0200
@@ -156,7 +156,7 @@
if( !getStorage()->isDisk(d))
getStorage()->changeFormatVolume( d, false, FSNONE );
}
- getStorage()->setUsedBy( d, UB_LVM, name() );
+ getStorage()->setUsedBy(d, UB_LVM, device());
free_pe += pe;
num_pe += pe;
++i;
@@ -895,7 +895,7 @@
PeContainer::addPv( *p );
if( !deleted() &&
find( pv_remove.begin(), pv_remove.end(), *p )==pv_remove.end() )
- getStorage()->setUsedBy( p->device, UB_LVM, name() );
+ getStorage()->setUsedBy(p->device, UB_LVM, device());
delete p;
p = new Pv;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libstorage-2.18.16/storage/Md.cc new/libstorage-2.18.16/storage/Md.cc
--- old/libstorage-2.18.16/storage/Md.cc 2009-06-03 14:34:33.000000000 +0200
+++ new/libstorage-2.18.16/storage/Md.cc 2009-06-16 12:09:56.000000000 +0200
@@ -161,7 +161,7 @@
}
for (list<string>::iterator it = devs.begin(); it != devs.end(); ++it)
- getContainer()->getStorage()->setUsedBy(*it, UB_MD, dev.substr(5));
+ getContainer()->getStorage()->setUsedBy(*it, UB_MD, dev);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libstorage-2.18.16/storage/MdCo.cc new/libstorage-2.18.16/storage/MdCo.cc
--- old/libstorage-2.18.16/storage/MdCo.cc 2009-06-03 14:34:33.000000000 +0200
+++ new/libstorage-2.18.16/storage/MdCo.cc 2009-06-16 12:09:56.000000000 +0200
@@ -281,7 +281,7 @@
while( ret==0 && i!=devs.end() )
{
string d = normalizeDevice( *i );
- getStorage()->setUsedBy( d, UB_MD, "md"+decString(num) );
+ getStorage()->setUsedBy(d, UB_MD, "/dev/md" + decString(num));
++i;
}
if( ret==0 )
@@ -358,7 +358,7 @@
if( ret==0 )
{
string d = normalizeDevice( dev );
- getStorage()->setUsedBy( d, UB_MD, "md"+decString(num) );
+ getStorage()->setUsedBy(d, UB_MD, "/dev/md" + decString(num));
}
y2mil("ret:" << ret);
return( ret );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libstorage-2.18.16/storage/Storage.cc new/libstorage-2.18.16/storage/Storage.cc
--- old/libstorage-2.18.16/storage/Storage.cc 2009-06-12 14:09:18.000000000 +0200
+++ new/libstorage-2.18.16/storage/Storage.cc 2009-06-16 12:09:56.000000000 +0200
@@ -4825,7 +4825,7 @@
}
-bool Storage::setUsedBy(const string& dev, UsedByType ub_type, const string& ub_name)
+bool Storage::setUsedBy(const string& dev, UsedByType ub_type, const string& ub_device)
{
bool ret=true;
VolIterator v;
@@ -4834,21 +4834,21 @@
DiskIterator i = findDisk( dev );
if( i != dEnd() )
{
- i->setUsedBy(ub_type, ub_name);
+ i->setUsedBy(ub_type, ub_device);
}
else
{
ret = false;
- danglingUsedBy[dev] = storage::usedBy(ub_type, ub_name);
- y2mil("adding ub_type:" << ub_type << " ub_name:" << ub_name <<
+ danglingUsedBy[dev] = storage::usedBy(ub_type, ub_device);
+ y2mil("adding ub_type:" << ub_type << " ub_device:" << ub_device <<
" for dev:" << dev << " to dangling usedby");
}
}
else
{
- v->setUsedBy(ub_type, ub_name);
+ v->setUsedBy(ub_type, ub_device);
}
- y2mil("dev:" << dev << " ub_type:" << ub_type << " ub_name:" << ub_name << " ret:" << ret);
+ y2mil("dev:" << dev << " ub_type:" << ub_type << " ub_device:" << ub_device << " ret:" << ret);
return ret;
}
@@ -5230,10 +5230,9 @@
ret = removeVolume(uby.device());
break;
case UB_LVM:
- ret = removeLvmVg(uby.name());
+ ret = removeLvmVg(uby.device().substr(5));
break;
case UB_DMRAID:
- //ret = removeDmraidCo( name );
break;
case UB_DMMULTIPATH:
break;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libstorage-2.18.16/storage/Storage.h new/libstorage-2.18.16/storage/Storage.h
--- old/libstorage-2.18.16/storage/Storage.h 2009-06-12 14:09:18.000000000 +0200
+++ new/libstorage-2.18.16/storage/Storage.h 2009-06-16 12:09:56.000000000 +0200
@@ -245,7 +245,7 @@
bool usedBy( const string& dev, storage::usedBy& ub );
bool clearUsedBy(const string& dev);
bool setUsedBy(const string& dev, storage::UsedByType ub_type,
- const string& ub_name);
+ const string& ub_device);
void fetchDanglingUsedBy(const string& dev, storage::usedBy& uby);
bool canUseDevice( const string& dev, bool disks_allowed=false );
bool knownDevice( const string& dev, bool disks_allowed=false );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libstorage-2.18.16/storage/StorageTypes.cc new/libstorage-2.18.16/storage/StorageTypes.cc
--- old/libstorage-2.18.16/storage/StorageTypes.cc 2009-06-03 14:34:33.000000000 +0200
+++ new/libstorage-2.18.16/storage/StorageTypes.cc 2009-06-16 12:09:56.000000000 +0200
@@ -71,25 +71,6 @@
};
- const string usedBy::device() const
- {
- switch (ub_type)
- {
- case UB_NONE:
- return "";
-
- case UB_LVM:
- case UB_MD:
- return "/dev/" + ub_name;
-
- case UB_DM:
- case UB_DMRAID:
- case UB_DMMULTIPATH:
- return "/dev/mapper/" + ub_name;
- }
- }
-
-
usedBy::operator string() const
{
string st;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libstorage-2.18.16/storage/StorageTypes.h new/libstorage-2.18.16/storage/StorageTypes.h
--- old/libstorage-2.18.16/storage/StorageTypes.h 2009-06-03 14:34:33.000000000 +0200
+++ new/libstorage-2.18.16/storage/StorageTypes.h 2009-06-16 12:09:56.000000000 +0200
@@ -137,31 +137,28 @@
class usedBy
{
- // TODO: save device instead of name?
-
public:
usedBy() : ub_type(storage::UB_NONE) {}
- usedBy(storage::UsedByType type, const string& name) : ub_type(type), ub_name(name) {}
+ usedBy(storage::UsedByType type, const string& device) : ub_type(type), ub_device(device) {}
- void clear() { ub_type = storage::UB_NONE; ub_name.erase(); }
- void set(storage::UsedByType type, const string& name)
- { ub_type = type; (ub_type==storage::UB_NONE)?ub_name.erase():ub_name = name; }
+ void clear() { ub_type = storage::UB_NONE; ub_device.erase(); }
+ void set(storage::UsedByType type, const string& device)
+ { ub_type = type; (ub_type == storage::UB_NONE) ? ub_device.erase() : ub_device = device; }
bool operator==(const usedBy& rhs) const
- { return ub_type == rhs.ub_type && ub_name == rhs.ub_name; }
+ { return ub_type == rhs.ub_type && ub_device == rhs.ub_device; }
bool operator!=(const usedBy& rhs) const
{ return !(*this == rhs); }
storage::UsedByType type() const { return ub_type; }
- const string& name() const { return ub_name; }
- const string device() const;
+ string device() const { return ub_device; }
friend std::ostream& operator<<(std::ostream&, const usedBy&);
private:
operator string() const;
storage::UsedByType ub_type;
- string ub_name;
+ string ub_device;
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libstorage-2.18.16/storage/Volume.h new/libstorage-2.18.16/storage/Volume.h
--- old/libstorage-2.18.16/storage/Volume.h 2009-06-03 14:34:33.000000000 +0200
+++ new/libstorage-2.18.16/storage/Volume.h 2009-06-16 12:09:56.000000000 +0200
@@ -55,7 +55,7 @@
bool fstabAdded() const { return( fstab_added ); }
void clearUsedBy() { uby.clear(); }
- void setUsedBy(storage::UsedByType ub_type, const string& ub_name) { uby.set(ub_type, ub_name); }
+ void setUsedBy(storage::UsedByType ub_type, const string& ub_device) { uby.set(ub_type, ub_device); }
const storage::usedBy& getUsedBy() const { return uby; }
storage::UsedByType getUsedByType() const { return uby.type(); }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libstorage-2.18.16/testsuite/humanstring1.cc new/libstorage-2.18.16/testsuite/humanstring1.cc
--- old/libstorage-2.18.16/testsuite/humanstring1.cc 2009-06-10 15:40:52.000000000 +0200
+++ new/libstorage-2.18.16/testsuite/humanstring1.cc 2009-06-16 12:38:41.000000000 +0200
@@ -1,4 +1,5 @@
+#include