commit libstorage for openSUSE:Factory
Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at Wed Jul 29 16:03:31 CEST 2009. -------- --- libstorage/libstorage.changes 2009-07-24 16:45:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/libstorage/libstorage.changes 2009-07-28 11:08:31.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 28 10:16:10 CEST 2009 - aschnell@suse.de + +- fix for mmcblk devices + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage.spec ++++++ --- /var/tmp/diff_new_pack.C4nLy7/_old 2009-07-29 16:02:57.000000000 +0200 +++ /var/tmp/diff_new_pack.C4nLy7/_new 2009-07-29 16:02:57.000000000 +0200 @@ -20,7 +20,7 @@ Name: libstorage Version: 2.18.20 -Release: 1 +Release: 2 License: GPL Group: System/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ libstorage-2.18.20.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.18.20/storage/Dasd.cc new/libstorage-2.18.20/storage/Dasd.cc --- old/libstorage-2.18.20/storage/Dasd.cc 2009-07-21 16:29:32.000000000 +0200 +++ new/libstorage-2.18.20/storage/Dasd.cc 2009-07-28 10:15:31.000000000 +0200 @@ -192,11 +192,7 @@ } } y2mil("nm:" << nm); - string reg = nm; - if( !reg.empty() && reg.find( '/' )!=string::npos && - isdigit(reg[reg.length()-1]) ) - reg += "p"; - reg = "^" + reg + "[0-9]+" "$"; + string reg = "^" + nm + partNaming(nm) + "[0-9]+" "$"; list<string> ps = ppart.getMatchingEntries(regex_matches(reg)); y2mil("regex:\"" << reg << "\" ps:" << ps); unsigned long dummy = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.18.20/storage/Disk.cc new/libstorage-2.18.20/storage/Disk.cc --- old/libstorage-2.18.20/storage/Disk.cc 2009-07-24 16:14:46.000000000 +0200 +++ new/libstorage-2.18.20/storage/Disk.cc 2009-07-28 10:15:00.000000000 +0200 @@ -258,8 +258,6 @@ bool Disk::getSysfsInfo(const string& sysfsdir, SysfsInfo& sysfsinfo) { - bool ret = true; - string sysfsfile = sysfsdir + "/dev"; if (access(sysfsfile.c_str(), R_OK) == 0) { @@ -270,13 +268,15 @@ } else { - ret = false; + y2err("reading " << sysfsfile << " failed"); + return false; } sysfsfile = sysfsdir + "/device"; if (!readlink(sysfsfile, sysfsinfo.device)) { - ret = false; + y2err("reading " << sysfsfile << " failed"); + return false; } sysfsfile = sysfsdir + "/range"; @@ -288,7 +288,8 @@ } else { - ret = false; + y2err("reading " << sysfsfile << " failed"); + return false; } sysfsfile = sysfsdir + "/ext_range"; @@ -308,16 +309,15 @@ } else { - ret = false; + y2err("reading " << sysfsfile << " failed"); + return false; } - y2mil("sysfsdir:" << sysfsdir << " ret:" << ret); + y2mil("sysfsdir:" << sysfsdir << " mjr:" << sysfsinfo.mjr << " mnr:" << sysfsinfo.mnr << + " device:" << sysfsinfo.device << " range:" << sysfsinfo.range << " size:" << + sysfsinfo.size); - if (ret) - y2mil("mjr:" << sysfsinfo.mjr << " mnr:" << sysfsinfo.mnr << " device:" << - sysfsinfo.device << " range:" << sysfsinfo.range << " size:" << sysfsinfo.size); - - return ret; + return true; } @@ -916,11 +916,7 @@ parted_l[(*i)->nr()] = (*i)->cylSize(); } } - string reg = diskname; - if( !reg.empty() && reg.find( '/' )!=string::npos && - isdigit(reg[reg.length()-1]) ) - reg += "p"; - reg = "^" + reg + "[0-9]+" "$"; + string reg = "^" + diskname + partNaming(diskname) + "[0-9]+" "$"; list<string> ps = pp.getMatchingEntries(regex_matches(reg)); y2mil("regex:\"" << reg << "\" ps:" << ps); for( list<string>::const_iterator i=ps.begin(); i!=ps.end(); i++ ) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de