February 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55805 - /trunk/storage/libstorage/src/Volume.cc
by aschnell＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: aschnell Date: Thu Feb 26 22:27:50 2009 New Revision: 55805 URL: http://svn.opensuse.org/viewcvs/yast?rev=55805&view=rev Log: - quote device name Modified: trunk/storage/libstorage/src/Volume.cc Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc… ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Thu Feb 26 22:27:50 2009 @@ -1683,14 +1683,13 @@ { case EXT2: case EXT3: - cmd = "fsck.ext2 -n -f " + use_dev; + cmd = "fsck.ext2 -n -f " + quote(use_dev); break; case REISERFS: - cmd = "reiserfsck --yes --check -q " + use_dev; + cmd = "reiserfsck --yes --check -q " + quote(use_dev); break; default: - cmd = "fsck -n -t " + fsTypeString(detected_fs) + - " " + use_dev; + cmd = "fsck -n -t " + fsTypeString(detected_fs) + " " + quote(use_dev); break; } bool excTime, excLines; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55804 - /trunk/storage/libstorage/src/Volume.cc
by aschnell＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: aschnell Date: Thu Feb 26 22:26:27 2009 New Revision: 55804 URL: http://svn.opensuse.org/viewcvs/yast?rev=55804&view=rev Log: - use new logging functions Modified: trunk/storage/libstorage/src/Volume.cc Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc… ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Thu Feb 26 22:26:27 2009 @@ -316,7 +316,7 @@ mp.clear(); } if( is_mounted ) - y2milestone( "%s mounted on %s", device().c_str(), mp.c_str() ); + y2mil(device() << " mounted on " << mp); } orig_mp = mp; } @@ -487,8 +487,7 @@ int Volume::setFormat( bool val, storage::FsType new_fs ) { int ret = 0; - y2milestone( "device:%s val:%d fs:%s", dev.c_str(), val, - fs_names[new_fs].c_str() ); + y2mil("device:" << dev << " val:" << val << " fs:" << fs_names[new_fs]); format = val; if( !format ) { @@ -615,8 +614,7 @@ int Volume::changeFstabOptions( const string& options ) { int ret = 0; - y2milestone( "device:%s options:%s encr:%s", dev.c_str(), options.c_str(), - encTypeString(encryption).c_str() ); + y2mil("device:" << dev << " options:" << options << " encr:" << encTypeString(encryption)); if( uby.type() != UB_NONE ) { ret = VOLUME_ALREADY_IN_USE; @@ -923,7 +921,7 @@ int Volume::umount( const string& mp ) { SystemCmd cmd; - y2milestone( "device:%s mp:%s", dev.c_str(), mp.c_str() ); + y2mil("device:" << dev << " mp:" << mp); string d = mountDevice(); if( dmcrypt_active ) d = dmcrypt_dev; @@ -1070,7 +1068,7 @@ void Volume::rename( const string& newName ) { - y2milestone( "rename old:%s new:%s", nm.c_str(), newName.c_str() ); + y2mil("rename old:" << nm << " new:" << newName); string::size_type pos; if( (pos=dev.rfind( nm ))!=string::npos ) { @@ -1100,7 +1098,7 @@ ret = VOLUME_DEVICE_NOT_PRESENT; else if( !S_ISBLK(sbuf.st_mode) ) ret = VOLUME_DEVICE_NOT_BLOCK; - y2milestone( "checkDevice:%s ret:%d", device.c_str(), ret ); + y2mil("checkDevice:" << device << " ret:" << ret); return( ret ); } @@ -1112,8 +1110,7 @@ lmount += cont->getStorage()->root(); if( mp!="/" ) lmount += mp; - y2milestone( "device:%s mp:%s old mp:%s", dev.c_str(), mp.c_str(), - orig_mp.c_str() ); + y2mil("device:" << dev << " mp:" << mp << " old mp:" << orig_mp); if( !silent() ) { cont->getStorage()->showInfoCb( mountText(true) ); @@ -1163,7 +1160,7 @@ int Volume::canResize( unsigned long long newSizeK ) const { int ret=0; - y2milestone( "val:%llu", newSizeK ); + y2mil("val:" << newSizeK); if( uby.type() != UB_NONE ) { ret = VOLUME_ALREADY_IN_USE; @@ -1302,7 +1299,7 @@ int Volume::setEncryption( bool val, EncryptType typ ) { int ret = 0; - y2milestone( "val:%d typ:%d", val, typ ); + y2mil("val:" << val << " typ:" << typ); if( getUsedByType() != UB_NONE ) { ret = VOLUME_ALREADY_IN_USE; @@ -1442,8 +1439,7 @@ else fstab_loop_dev = loop_dev; } - y2milestone( "loop_dev:%s fstab_loop_dev:%s", loop_dev.c_str(), - fstab_loop_dev.c_str() ); + y2mil("loop_dev:" << loop_dev << " fstab_loop_dev:" << fstab_loop_dev); return( ret ); } @@ -1476,7 +1472,7 @@ string cmd = LOSETUPBIN " " + quote(loop_dev) + " "; const Loop* l = static_cast<const Loop*>(this); cmd += quote(l->lfileRealPath()); - y2milestone( "cmd:%s", cmd.c_str() ); + y2mil("cmd:" << cmd); return( cmd ); } @@ -1572,7 +1568,7 @@ } } - y2milestone( "cmd:%s", cmd.c_str() ); + y2mil("cmd:" << cmd); return( cmd ); } @@ -1580,7 +1576,7 @@ Volume::setCryptPwd( const string& val ) { #ifdef DEBUG_LOOP_CRYPT_PASSWORD - y2milestone( "password:%s", val.c_str() ); + y2mil("password:" << val); #endif int ret = 0; @@ -1640,7 +1636,7 @@ if( getContainer()->getStorage()->test() ) { ret = encryption = orig_encryption = ENC_TWOFISH; - y2milestone( "ret:%s", encTypeString(ret).c_str() ); + y2mil("ret:" << encTypeString(ret)); return( ret ); } @@ -1650,7 +1646,7 @@ string fname = cont->getStorage()->tmpDir()+"/pwdf"; string mpname = cont->getStorage()->tmpDir()+"/mp"; SystemCmd c; - y2milestone( "device:%s", dev.c_str() ); + y2mil("device:" << dev); mkdir( mpname.c_str(), 0700 ); getFreeLoop(); @@ -1700,8 +1696,8 @@ bool excTime, excLines; c.executeRestricted( cmd, 15, 500, excTime, excLines ); bool ok = c.retcode()==0 || (excTime && !excLines); - y2milestone( "ok:%d retcode:%d excTime:%d excLines:%d", - ok, c.retcode(), excTime, excLines ); + y2mil("ok:" << ok << " retcode:" << c.retcode() << " excTime:" << excTime << + " excLines:" << excLines); if( ok ) { c.execute(MODPROBEBIN " " + fs_names[detected_fs]); @@ -1738,15 +1734,14 @@ unlink( fname.c_str() ); rmdir( mpname.c_str() ); rmdir( cont->getStorage()->tmpDir().c_str() ); - y2milestone( "ret:%s", encTypeString(ret).c_str() ); + y2mil("ret:" << encTypeString(ret)); return( ret ); } int Volume::doLosetup() { int ret = 0; - y2milestone( "device:%s mp:%s is_loop:%d loop_active:%d", - dev.c_str(), mp.c_str(), is_loop, loop_active ); + y2mil("device:" << dev << " mp:" << mp << " is_loop:" << is_loop << " loop_active:" << loop_active); if( !silent() && is_loop && !dmcrypt() ) { cont->getStorage()->showInfoCb( losetupText(true) ); @@ -1850,8 +1845,7 @@ int Volume::doCryptsetup() { int ret = 0; - y2milestone( "device:%s mp:%s dmcrypt:%d active:%d", - dev.c_str(), mp.c_str(), dmcrypt(), dmcrypt_active ); + y2mil("device:" << dev << " mp:" << mp << " dmcrypt:" << dmcrypt() << " active:" << dmcrypt_active); if( !silent() && dmcrypt() ) { cont->getStorage()->showInfoCb( crsetupText(true) ); @@ -2079,7 +2073,7 @@ int Volume::setLabel( const string& val ) { int ret=0; - y2milestone( "label:%s", val.c_str() ); + y2mil("label:" << val); FsCapabilities caps; if( cont->getStorage()->getFsCapabilities( fs, caps ) && caps.supportsLabel ) @@ -2100,12 +2094,12 @@ int Volume::mount( const string& m, bool ro ) { SystemCmd cmd; - y2milestone( "device:%s mp:%s ro:%d", dev.c_str(), m.c_str(), ro ); + y2mil("device:" << dev << " mp:" << m << " ro:" << ro); string cmdline; if( fs != SWAP ) { string lmount = (!m.empty())?m:mp; - y2milestone( "device:%s mp:%s", dev.c_str(), lmount.c_str() ); + y2mil("device:" << dev << " mp:" << lmount); string fsn = fs_names[fs]; switch( fs ) { @@ -2184,7 +2178,7 @@ int Volume::prepareRemove() { int ret = 0; - y2milestone( "device:%s", dev.c_str() ); + y2mil("device:" << dev); if( !orig_mp.empty() ) { if( isMounted() ) @@ -2404,7 +2398,7 @@ cont->getStorage()->showInfoCb( fstab->removeText( true, entry.crypto, entry.mount )); } - y2milestone( "before removeEntry" ); + y2mil("before removeEntry"); ret = fstab->removeEntry( entry ); } else if( !mp.empty() && !deleted() ) @@ -2545,13 +2539,13 @@ c.execute( "/etc/init.d/boot.quota restart" ); } } - y2milestone( "changed:%d ret:%d", changed, ret ); + y2mil("changed:" << changed << " ret:" << ret); return( ret ); } void Volume::fstabUpdateDone() { - y2milestone( "begin" ); + y2mil("begin"); orig_fstab_opt = fstab_opt; orig_mount_by = mount_by; orig_encryption = encryption; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55803 - /trunk/storage/libstorage/src/Disk.cc
by aschnell＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: aschnell Date: Thu Feb 26 22:12:03 2009 New Revision: 55803 URL: http://svn.opensuse.org/viewcvs/yast?rev=55803&view=rev Log: - use new logging functions Modified: trunk/storage/libstorage/src/Disk.cc Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Thu Feb 26 22:12:03 2009 @@ -48,8 +48,7 @@ unsigned num, unsigned long long SizeK, ProcPart& ppart ) : Container(s,Name,staticType()) { - y2milestone( "constructed disk %s nr %u sizeK:%llu", Name.c_str(), num, - SizeK ); + y2mil("constructed disk " << Name << " nr " << num << " sizeK:" << SizeK); logfile_name = Name + decString(num); init_disk = dmp_slave = iscsi = gpt_enlarge = false; ronly = true; @@ -212,7 +211,7 @@ unsigned long long bytes = kb * 1024; bytes += byte_cyl - 1; unsigned long ret = bytes/byte_cyl; - y2milestone( "KB:%lld ret:%ld byte_cyl:%ld", kb, ret, byte_cyl ); + y2mil("KB:" << kb << " ret:" << ret << " byte_cyl:" << byte_cyl); return (ret); } @@ -239,12 +238,11 @@ sector = geometry.sectors>0?geometry.sectors:sector; cyl = geometry.cylinders>0?geometry.cylinders:cyl; } - y2milestone( "After HDIO_GETGEO ret %d Head:%u Sector:%u Cylinder:%lu", - rcode, head, sector, cyl ); + y2mil("After HDIO_GETGEO ret " << rcode << " Head:" << head << " Sector:" << sector << + " Cylinder:" << cyl); __uint64_t sect = 0; rcode = ioctl( fd, BLKGETSIZE64, &sect); - y2milestone( "BLKGETSIZE64 Ret:%d Bytes:%llu", rcode, - (unsigned long long int) sect ); + y2mil("BLKGETSIZE64 Ret:" << rcode << " Bytes:" << sect); if( rcode==0 && sect!=0 ) { sect /= 512; @@ -255,7 +253,7 @@ { unsigned long lsect; rcode = ioctl( fd, BLKGETSIZE, &lsect ); - y2milestone( "BLKGETSIZE Ret:%d Sect:%lu", rcode, lsect ); + y2mil("BLKGETSIZE Ret:" << rcode << " Sect:" << lsect); if( rcode==0 && lsect!=0 ) { cyl = lsect / (unsigned long)(head*sector); @@ -266,7 +264,7 @@ close( fd ); } byte_cyl = head * sector * 512; - y2milestone( "ret:%d byte_cyl:%lu", ret, byte_cyl ); + y2mil("ret:" << ret << " byte_cyl:" << byte_cyl); return( ret ); } @@ -274,7 +272,7 @@ { bool ret = true; sysfs_dir = SysfsDir; - y2mil( "sysfs_dir:" << sysfs_dir ); + y2mil("sysfs_dir:" << sysfs_dir); string SysfsFile = sysfs_dir+"/range"; if( access( SysfsFile.c_str(), R_OK )==0 ) { @@ -310,10 +308,10 @@ string lname( lbuf, count ); if( lname.find( "/session" )!=string::npos ) iscsi = true; - y2mil( "lname:" << lname ); + y2mil("lname:" << lname); } - y2milestone( "Ret:%d Range:%ld Major:%ld Minor:%ld iSCSI:%d", - ret, range, mjr, mnr, iscsi ); + y2mil("Ret:" << ret << " Range:" << range << " Major:" << mjr << " Minor:" << mnr << + " iSCSI:" << iscsi); return( ret ); } @@ -364,10 +362,10 @@ c = sizeK()*2/(s*h); if( c<=0 ) c=1; - y2mil( "new c:" << c ); + y2mil("new c:" << c); } - y2milestone( "line:%s", line.c_str() ); - y2milestone( "c:%lu h:%u s:%u", c, h, s ); + y2mil("line:" << line); + y2mil("c:" << c << " h:" << h << " s:" << s); } bool Disk::detectPartitions( ProcPart& ppart ) @@ -392,13 +390,12 @@ new_cyl = cyl; new_head = head; new_sector = sector; - y2milestone( "After parted Head:%u Sector:%u Cylinder:%lu", - head, sector, cyl ); + y2mil("After parted Head:" << head << " Sector:" << sector << " Cylinder:" << cyl); byte_cyl = head * sector * 512; - y2milestone( "byte_cyl:%lu", byte_cyl ); + y2mil("byte_cyl:" << byte_cyl); } gpt_enlarge = Cmd.select( "fix the GPT to use all" )>0; - y2milestone( "Label:%s gpt_enlarge:%d", dlabel.c_str(), gpt_enlarge ); + y2mil("Label:" << dlabel << " gpt_enlarge:" << gpt_enlarge); if( dlabel!="loop" ) { setLabelData( dlabel ); @@ -438,8 +435,8 @@ ronly = true; } - y2milestone( "ret:%d partitons:%zd detected label:%s label:%s", ret, - vols.size(), detected_label.c_str(), label.c_str() ); + y2mil("ret:" << ret << " partitons:" << vols.size() << " detected label:" << detected_label << + " label:" << label); return( ret ); } @@ -510,8 +507,8 @@ max_logical = min(labels[i].logical,unsigned(range-1)); label = labels[i].name; } - y2milestone( "name:%s ext:%d primary:%d logical:%d", label.c_str(), - ext_possible, max_primary, max_logical ); + y2mil("name:" << label << " ext:" << ext_possible << " primary:" << max_logical << + " logical:" << max_logical); } unsigned long long @@ -527,7 +524,7 @@ { ret = labels[i].max_size_k; } - y2milestone( "label:%s ret:%llu", label.c_str(), ret ); + y2mil("label:" << label << " ret:" << ret); return( ret ); } @@ -650,9 +647,8 @@ TInfo += ","; if( nr>0 ) { - y2milestone( "Fields Num:%d Start:%lu End:%lu Type:%d", - nr, StartM, EndM, type ); - y2milestone( "TInfo:%s", TInfo.c_str() ); + y2mil("Fields Num:" << nr << " Start:" << StartM << " End:" << EndM << " Type:" << type); + y2mil("TInfo:" << TInfo); start = StartM; csize = EndM-StartM+1; if( start+csize > cylinders() ) @@ -766,8 +762,8 @@ id = Partition::ID_APPLE_HFS; } } - y2milestone( "Fields Num:%d Id:%x Ptype:%d Start:%ld Size:%ld", - nr, id, type, start, csize ); + y2mil("Fields Num:" << nr << " Id:" << id << " Ptype:" << type << " Start:" << start << + " Size:" << csize); } return( nr>0 ); } @@ -815,7 +811,7 @@ } } } - y2mil( "nm:" << nm ); + y2mil("nm:" << nm); if( !dmp_slave && !checkPartedValid( ppart, nm, pl, range_exceed ) ) { string txt = sformat( @@ -886,7 +882,7 @@ reg += "p"; reg += "[0-9]+"; list<string> ps = pp.getMatchingEntries( reg ); - y2mil( "regex " << reg << " ps " << ps ); + y2mil("regex " << reg << " ps " << ps); for( list<string>::const_iterator i=ps.begin(); i!=ps.end(); i++ ) { pair<string,unsigned> p = getDiskPartition( *i ); @@ -896,8 +892,8 @@ proc_l[p.second] = kbToCylinder( SizeK ); } } - y2mil( "proc :" << proc_l ); - y2mil( "parted:" << parted_l ); + y2mil("proc :" << proc_l); + y2mil("parted:" << parted_l); if( proc_l.size()>=parted_l.size() && !parted_l.empty() ) { map<unsigned,unsigned long>::const_iterator i, j; @@ -1266,7 +1262,7 @@ int Disk::createPartition( unsigned long cylLen, string& device, bool checkRelaxed ) { - y2milestone( "len %ld relaxed:%d", cylLen, checkRelaxed ); + y2mil("len:" << cylLen << " relaxed:" << checkRelaxed); getStorage()->logCo( this ); int ret = 0; list<Region> free; @@ -1376,8 +1372,7 @@ unsigned long len, string& device, bool checkRelaxed ) { - y2milestone( "begin type %d at %ld len %ld relaxed:%d", type, start, len, - checkRelaxed ); + y2mil("begin type " << type << " at " << start << " len " << len << " relaxed:" << checkRelaxed); getStorage()->logCo( this ); int ret = createChecks( type, start, len, checkRelaxed ); int number = 0; @@ -1409,15 +1404,14 @@ addToList( p ); } getStorage()->logCo( this ); - y2milestone( "ret:%d device:%s", ret, ret==0?device.c_str():"" ); + y2mil("ret:" << ret << " device:" << (ret==0?device:"")); return( ret ); } int Disk::createChecks( PartitionType& type, unsigned long start, unsigned long len, bool checkRelaxed ) { - y2milestone( "begin type %d at %ld len %ld relaxed:%d", type, start, len, - checkRelaxed ); + y2mil("begin type " << type << " at " << start << " len " << len << " relaxed:" << checkRelaxed); unsigned fuzz = checkRelaxed ? 2 : 0; int ret = 0; Region r( start, len ); @@ -1436,7 +1430,7 @@ } if( ret==0 && (r.end() > cylinders()+fuzz) ) { - y2milestone( "too large for disk cylinders %lu", cylinders() ); + y2mil("too large for disk cylinders " << cylinders()); ret = DISK_PARTITION_EXCEEDS_DISK; } if( ret==0 && len==0 ) @@ -1484,8 +1478,7 @@ int Disk::changePartitionArea( unsigned nr, unsigned long start, unsigned long len, bool checkRelaxed ) { - y2milestone( "begin nr %u at %ld len %ld relaxed:%d", nr, start, len, - checkRelaxed ); + y2mil("begin nr " << nr << " at " << start << " len " << len << " relaxed:" << checkRelaxed); int ret = 0; Region r( start, len ); unsigned fuzz = checkRelaxed ? 2 : 0; @@ -1505,7 +1498,7 @@ } if( ret==0 && r.end() > cylinders()+fuzz ) { - y2milestone( "too large for disk cylinders %lu", cylinders() ); + y2mil("too large for disk cylinders " << cylinders()); ret = DISK_PARTITION_EXCEEDS_DISK; } if( ret==0 && len==0 ) @@ -1658,7 +1651,7 @@ void Disk::changeNumbers( const PartIter& b, const PartIter& e, unsigned start, int incr ) { - y2milestone( "start:%u incr:%d", start, incr ); + y2mil("start:" << start << " incr:" << incr); PartIter i(b); while( i!=e ) { @@ -1785,7 +1778,7 @@ vol.push_back( &(*i) ); } if( col.size()!=oco || vol.size()!=ovo ) - y2milestone( "ret:%d col:%zd vol:%zd", ret, col.size(), vol.size()); + y2mil("ret:" << ret << " col:" << col.size() << " vol:" << vol.size()); return( ret ); } @@ -1866,7 +1859,7 @@ int Disk::doCreateLabel() { - y2milestone( "label:%s", label.c_str() ); + y2mil("label:" << label); int ret = 0; if( !silent ) { @@ -1953,16 +1946,15 @@ new_cyl = c; new_head = h; new_sector = s; - y2milestone( "new parted geometry Head:%u Sector:%u Cylinder:%lu", - new_head, new_sector, new_cyl ); + y2mil("new parted geometry Head:" << new_head << " Sector:" << new_sector << + " Cylinder:" << new_cyl); } } } int Disk::doSetType( Volume* v ) { - y2milestone( "doSetType container %s name %s", name().c_str(), - v->name().c_str() ); + y2mil("doSetType container " << name() << " name " << v->name()); Partition * p = dynamic_cast<Partition *>(v); int ret = 0; if( p != NULL ) @@ -2067,7 +2059,7 @@ if( cmd.numLines()>0 && scanPartedLine( cmd.getLine(0), nr, start, csize, type, id, boot )) { - y2milestone( "really created at cyl:%ld csize:%ld", start, csize ); + y2mil("really created at cyl:" << start << " csize:" << csize); p->changeRegion( start, csize, cylinderToKb(csize) ); unsigned long long s=0; ret = true; @@ -2112,12 +2104,11 @@ std::istringstream data( cmd.getLine(0) ); classic(data); data >> dummy >> s1 >> s2; - y2milestone( "dummy:\"%s\" s1:\"%s\" s2:\"%s\"", dummy.c_str(), - s1.c_str(), s2.c_str() ); + y2mil("dummy:\"" << dummy << "\" s1:\"" << s1 << "\" s2:\"" << s2 << "\""); start = end = 0; s1 >> start; s2 >> end; - y2milestone( "start:%llu end:%llu", start, end ); + y2mil("start:" << start << " end:" << end); ret = end>0; } } @@ -2154,12 +2145,9 @@ getStorage()->showInfoCb( p->createText(true) ); } system_stderr.erase(); - y2milestone( "doCreate container %s name %s", name().c_str(), - p->name().c_str() ); - y2milestone( "doCreate nr:%d start %ld len %ld", p->nr(), - p->cylStart(), p->cylSize() ); - y2milestone( "doCreate detected_label:%s label:%s", - detected_label.c_str(), label.c_str() ); + y2mil("doCreate container " << name() << " name " << p->name()); + y2mil("doCreate nr:" << p->nr() << " start " << p->cylStart() << " len " << p->cylSize()); + y2mil("doCreate detected_label:" << detected_label << " label:" << label); if( detected_label != label ) { ret = doCreateLabel(); @@ -2228,8 +2216,8 @@ if( !ext.empty() ) maxc = ext.begin()->cylEnd(); } - y2milestone( "max %lu end:%lu", maxc, end ); - y2mil( "pp " << *p ); + y2mil("max " << maxc << " end:" << end); + y2mil("pp " << *p); for( PartIter i=pp.begin(); i!=pp.end(); ++i ) { y2mil( "i " << *i ); @@ -2240,21 +2228,19 @@ y2mil( "new maxc " << maxc ); } } - y2milestone( "max %lu", maxc ); + y2mil("max " << maxc); if( new_cyl!=cyl ) { - y2milestone( "parted geometry changed old c:%lu h:%u s:%u", - cyl, head, sector ); - y2milestone( "parted geometry changed new c:%lu h:%u s:%u", - new_cyl, new_head, new_sector ); - y2milestone( "old start:%lu end:%lu", start, end ); + y2mil("parted geometry changed old c:" << cyl << " h:" << head << " s:" << sector); + y2mil("parted geometry changed new c:" << new_cyl << " h:" << new_head << " s:" << new_sector); + y2mil("old start:" << start << " end:" << end); start = start * new_cyl / cyl; end = end * new_cyl / cyl; - y2milestone( "new start:%lu end:%lu", start, end ); + y2mil("new start:" << start << " end:" << end); } if( end>maxc && maxc<=cylinders() ) { - y2milestone( "corrected end from %lu to max %lu", end, maxc ); + y2mil("corrected end from " << end << " to max " << maxc); end = maxc; } if( start==0 && (label == "mac" || label == "amiga") ) @@ -2284,8 +2270,7 @@ // filesystem is a logical partition PartPair lc = partPair(logicalCreated); call_blockdev = lc.length()<=1; - y2milestone( "logicalCreated:%d call_blockdev:%d", - lc.length(), call_blockdev ); + y2mil("logicalCreated:" << lc.length() << " call_blockdev:" << call_blockdev); } } p->setCreated( false ); @@ -2295,8 +2280,7 @@ if( ret==0 && p->type()!=EXTENDED ) { bool used_as_pv = p->getUsedByType() == UB_LVM; - y2milestone( "zeroNew:%d used_as_pv:%d", - getStorage()->getZeroNewPartitions(), used_as_pv ); + y2mil("zeroNew:" << getStorage()->getZeroNewPartitions() << " used_as_pv:" << used_as_pv); if( used_as_pv || getStorage()->getZeroNewPartitions() ) { ret = getStorage()->zeroDevice(p->device(), p->sizeK()); @@ -2345,8 +2329,7 @@ getStorage()->showInfoCb( p->removeText(true) ); } system_stderr.erase(); - y2milestone( "doRemove container %s name %s", name().c_str(), - p->name().c_str() ); + y2mil("doRemove container " << name() << " name " << p->name()); if( !dmp_slave ) { getStorage()->removeDmMapsTo( getPartName(p->OrigNr()) ); @@ -2495,7 +2478,7 @@ bool Disk::isLogical( unsigned nr ) const { bool ret = ext_possible && nr>max_primary; - y2milestone( "nr:%u ret:%d", nr, ret ); + y2mil("nr:" << nr << " ret:" << ret); return( ret ); } @@ -2524,14 +2507,13 @@ if( ret==0 ) { system_stderr.erase(); - y2milestone( "doResize container %s name %s", name().c_str(), - p->name().c_str() ); + y2mil("doResize container " << name() << " name " << p->name()); std::ostringstream cmd_line; classic(cmd_line); unsigned long long start_sect, end_sect; getPartedSectors( p, start_sect, end_sect ); end_sect = start_sect + p->sizeK()*2 - 1; - y2milestone( "end_sect %llu", end_sect ); + y2mil("end_sect " << end_sect); const Partition * after = getPartitionAfter( p ); unsigned long max_end = sizeK()*2-1; if( after!=NULL ) @@ -2573,8 +2555,7 @@ if( ret==0 ) ret = DISK_PARTITION_NOT_FOUND; } - y2milestone( "after resize size:%llu resize:%d", p->sizeK(), - p->needShrink()||p->needExtend() ); + y2mil("after resize size:" << p->sizeK() << " resize:" << (p->needShrink()||p->needExtend())); } if( needExtend && !dmp_slave && p->getFs()!=HFS && p->getFs()!=HFSPLUS && p->getFs()!=VFAT && @@ -2604,7 +2585,7 @@ ret = &(*pi); } if( ret==NULL ) - y2milestone( "ret:NULL" ); + y2mil( "ret:NULL" ); else y2mil( "ret:" << *ret ); return( ret ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55802 - /trunk/storage/libstorage/src/Dasd.cc
by aschnell＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: aschnell Date: Thu Feb 26 20:35:55 2009 New Revision: 55802 URL: http://svn.opensuse.org/viewcvs/yast?rev=55802&view=rev Log: - use new logging functions Modified: trunk/storage/libstorage/src/Dasd.cc Modified: trunk/storage/libstorage/src/Dasd.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dasd.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Dasd.cc (original) +++ trunk/storage/libstorage/src/Dasd.cc Thu Feb 26 20:35:55 2009 @@ -38,12 +38,12 @@ bool ret = true; string cmd_line = FDASDBIN " -p " + quote(device()); system_stderr.erase(); - y2milestone( "executing cmd:%s", cmd_line.c_str() ); + y2mil("executing cmd:" << cmd_line); SystemCmd Cmd( cmd_line ); - y2milestone( "retcode:%d", Cmd.retcode() ); + y2mil("retcode:" << Cmd.retcode()); if( Cmd.retcode() == 0 ) checkFdasdOutput( Cmd, ppart ); - y2milestone( "ret:%d partitons:%zd", ret, vols.size() ); + y2mil("ret:" << ret << " partitons:" << vols.size()); return( ret ); } @@ -54,15 +54,15 @@ system_stderr.erase(); detected_label = "dasd"; setLabelData( "dasd" ); - y2milestone( "executing cmd:%s", cmd_line.c_str() ); + y2mil("executing cmd:" << cmd_line); SystemCmd Cmd( cmd_line ); - y2milestone( "retcode:%d", Cmd.retcode() ); + y2mil("retcode:" << Cmd.retcode()); if( Cmd.retcode() == 0 ) { if( Cmd.select( "^format" )>0 ) { string tmp = Cmd.getLine(0, true); - y2milestone( "Format line:%s", tmp.c_str() ); + y2mil("Format line:" << tmp); tmp = tmp.erase( 0, tmp.find( ':' ) + 1 ); tmp = boost::to_lower_copy(extractNthWord(4, tmp), locale::classic()); if( tmp == "cdl" ) @@ -74,16 +74,15 @@ new_cyl = cyl; new_head = head; new_sector = sector; - y2milestone( "After dasdview Head:%u Sector:%u Cylinder:%lu SizeK:%llu", - head, sector, cyl, size_k ); + y2mil("After dasdview head:" << head << " sector:" << sector << " cylinder:" << cyl << " sizeK:" << size_k); byte_cyl = head * sector * 512; - y2milestone( "byte_cyl:%lu", byte_cyl ); + y2mil("byte_cyl:" << byte_cyl); if( size_k==0 ) { size_k = (head*sector*cyl)/2; - y2milestone( "New SizeK:%llu", size_k ); + y2mil("New SizeK:" << size_k); } - y2mil( "fmt:" << fmt ); + y2mil("fmt:" << fmt); switch( fmt ) { case DASDF_CDL: @@ -111,14 +110,13 @@ else { new_sector = sector = 96; - y2milestone( "new sector:%u", sector ); + y2mil("new sector:" << sector); } byte_cyl = head * sector * 512; - y2milestone( "byte_cyl:%lu", byte_cyl ); - y2milestone( "ret:%d partitons:%zd detected label:%s", ret, vols.size(), - label.c_str() ); + y2mil("byte_cyl:" << byte_cyl); + y2mil("ret:" << ret << " partitons:" << vols.size() << " detected label:" << label); ronly = fmt!=DASDF_CDL; - y2milestone( "fmt:%d readonly:%d", fmt, ronly ); + y2mil("fmt:" << fmt << " readonly:" << ronly); return( ret ); } @@ -139,7 +137,7 @@ Data >> devname >> StartM >> EndM; devname.erase(0,device().size()); devname >> nr; - y2milestone( "Fields Num:%d Start:%lu End:%lu", nr, StartM, EndM ); + y2mil("Fields Num:" << nr << " Start:" << StartM << " End:" << EndM); if( nr>0 ) { start = StartM/head; @@ -147,9 +145,9 @@ if( start+csize > cylinders() ) { csize = cylinders()-start; - y2milestone( "new csize:%lu", csize ); + y2mil("new csize:" << csize); } - y2milestone( "Fields Num:%d Start:%ld Size:%ld", nr, start, csize ); + y2mil("Fields Num:" << nr << " Start:" << start << " Size:" << csize); } return( nr>0 ); } @@ -194,14 +192,14 @@ } } } - y2mil( "nm:" << nm ); + y2mil("nm:" << nm); string reg = nm; if( !reg.empty() && reg.find( '/' )!=string::npos && isdigit(reg[reg.length()-1]) ) reg += "p"; reg += "[0-9]+"; list<string> ps = ppart.getMatchingEntries( reg ); - y2mil( "regex " << reg << " ps " << ps ); + y2mil("regex " << reg << " ps " << ps); unsigned long dummy = 0; if( !checkPartedValid( ppart, nm, pl, dummy ) ) { @@ -235,47 +233,47 @@ { val = 0; tmp = cmd.getLine(0, true); - y2milestone( "Cylinder line:%s", tmp.c_str() ); + y2mil("Cylinder line:" << tmp); tmp = tmp.erase( 0, tmp.find( ':' ) + 1 ); tmp = extractNthWord( 3, tmp ); tmp >> val; - y2mil( "val:" << val ); + y2mil("val:" << val); c=val; } if( cmd.select( "tracks per" )>0 ) { val = 0; tmp = cmd.getLine(0, true); - y2milestone( "Tracks line:%s", tmp.c_str() ); + y2mil("Tracks line:" << tmp); tmp = tmp.erase( 0, tmp.find( ':' ) + 1 ); tmp = extractNthWord( 3, tmp ); tmp >> val; - y2mil( "val:" << val ); + y2mil("val:" << val); h=val; } if( cmd.select( "blocks per" )>0 ) { val = 0; tmp = cmd.getLine(0, true); - y2milestone( "Blocks line:%s", tmp.c_str() ); + y2mil("Blocks line:" << tmp); tmp = tmp.erase( 0, tmp.find( ':' ) + 1 ); tmp = extractNthWord( 3, tmp ); tmp >> val; - y2mil( "val:" << val ); + y2mil("val:" << val); s=val; } if( cmd.select( "blocksize" )>0 ) { val = 0; tmp = cmd.getLine(0, true); - y2milestone( "Bytes line:%s", tmp.c_str() ); + y2mil("Bytes line:" << tmp); tmp = tmp.erase( 0, tmp.find( ':' ) + 1 ); tmp = extractNthWord( 3, tmp ); tmp >> val; - y2mil( "val:" << val ); + y2mil("val:" << val); s*=val/512; } - y2milestone( "c:%lu h:%u s:%u", c, h, s ); + y2mil("c:" << c << " h:" << h << " s:" << s); } bool Dasd::detectGeometry() @@ -284,7 +282,7 @@ sector *= 8; byte_cyl *= 8; cyl /= 8; - y2milestone( "cyl:%lu sector:%u byte_cyl:%lu", cyl, sector, byte_cyl ); + y2mil("cyl:" << cyl << " sector:" << sector << " byte_cyl:" << byte_cyl); return( true ); } @@ -300,7 +298,7 @@ int Dasd::removePartition( unsigned nr ) { - y2milestone( "begin nr %u", nr ); + y2mil("begin nr:" << nr); int ret = Disk::removePartition( nr ); if( ret==0 ) { @@ -315,8 +313,7 @@ unsigned long len, string& device, bool checkRelaxed ) { - y2milestone( "begin type %d at %ld len %ld relaxed:%d", type, start, len, - checkRelaxed ); + y2mil("begin type:" << type << " start:" << start << " len:" << len << " relaxed:" << checkRelaxed); int ret = createChecks( type, start, len, checkRelaxed ); int number = 0; if( ret==0 ) @@ -336,7 +333,7 @@ number++; ++i; } - y2milestone( "number %u", number ); + y2mil("number:" << number); changeNumbers( p.begin(), p.end(), number-1, 1 ); } } @@ -430,7 +427,7 @@ void Dasd::getCommitActions( list<commitAction*>& l ) const { - y2mil( "begin:" << name() << " init_disk:" << init_disk ); + y2mil("begin:" << name() << " init_disk:" << init_disk); Disk::getCommitActions( l ); if( init_disk ) { @@ -504,7 +501,7 @@ else ret = Disk::getToCommit( stage, col, vol ); if( col.size()!=oco || vol.size()!=ovo ) - y2milestone( "ret:%d col:%zd vol:%zd", ret, col.size(), vol.size()); + y2mil("ret:" << ret << " col:" << col.size() << " vol:" << vol.size()); return( ret ); } @@ -533,7 +530,7 @@ int Dasd::doDasdfmt() { int ret = 0; - y2milestone( "dasd:%s", device().c_str() ); + y2mil("dasd:" << device()); list<Disk*> dl; list<string> devs; getStorage()->getDiskList( needDasdfmt, dl ); @@ -543,7 +540,7 @@ { devs.push_back( undevDevice((*i)->device()) ); } - y2mil( "devs:" << devs ); + y2mil("devs:" << devs); if( !silent ) { string txt = dasdfmtTexts( dl.size()==1, mergeString(devs) ); @@ -555,7 +552,7 @@ *i = "-f " + quote(*i); } string cmd_line = DASDFMTBIN " -Y -P 4 -b 4096 -y -m 1 -d cdl " + mergeString(devs); - y2milestone( "cmdline:%s", cmd_line.c_str() ); + y2mil("cmdline:" << cmd_line); CallbackProgressBar cb = getStorage()->getCallbackProgressBarTheOne(); ScrollBarHandler* sb = new DasdfmtScrollbar( cb ); SystemCmd cmd; @@ -581,7 +578,7 @@ int Dasd::initializeDisk( bool value ) { - y2milestone( "value:%d old:%d", value, init_disk ); + y2mil("value:" << value << " old:" << init_disk); int ret = 0; if( init_disk != value ) { @@ -590,11 +587,11 @@ { new_sector = sector = 96; new_head = head = 15; - y2milestone( "new sector:%u head:%u", sector, head ); + y2mil("new sector:" << sector << " head:" << head); size_k = (head*sector*cyl)/2; - y2milestone( "new SizeK:%llu", size_k ); + y2mil("new SizeK:" << size_k); byte_cyl = head * sector * 512; - y2milestone( "new byte_cyl:%lu", byte_cyl ); + y2mil("new byte_cyl:" << byte_cyl); ret = destroyPartitionTable( "dasd" ); } else -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55801 - in /trunk/gtk: ChangeLog src/YGDialog.cc
by mkudlvasr＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: mkudlvasr Date: Thu Feb 26 20:11:04 2009 New Revision: 55801 URL: http://svn.opensuse.org/viewcvs/yast?rev=55801&view=rev Log: change src/YGDialog.cc to maximize window when screen width <= 800 OR screen height <= 600. There was AND previously. fixes bnc#462476 Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGDialog.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=55801&r1=55800… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Thu Feb 26 20:11:04 2009 @@ -1,3 +1,8 @@ +2009-02-26 Martin Kudlvasr <mkudlvasr(a)novell.com> + + * change src/YGDialog.cc to maximize window when screen width <= 800 OR + * screen height <= 600. There was AND previously. + 2009-02-13 Michael Meeks <michael.meeks(a)novell.com> * src/YGUtils.cc (ygutils_convert_to_xhtml): handle Modified: trunk/gtk/src/YGDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.cc?rev=55801&r1… ============================================================================== --- trunk/gtk/src/YGDialog.cc (original) +++ trunk/gtk/src/YGDialog.cc Thu Feb 26 20:11:04 2009 @@ -93,7 +93,7 @@ gtk_window_set_default_size (window, DEFAULT_WIDTH, DEFAULT_HEIGHT); if (YGUI::ui()->setFullscreen()) gtk_window_fullscreen (window); - else if (YUI::app()->displayWidth() <= 800 && YUI::app()->displayHeight() <= 600) + else if (YUI::app()->displayWidth() <= 800 || YUI::app()->displayHeight() <= 600) // maximize for small displays gtk_window_maximize (window); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55800 - /trunk/storage/libstorage/src/Storage.cc
by aschnell＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: aschnell Date: Thu Feb 26 19:45:23 2009 New Revision: 55800 URL: http://svn.opensuse.org/viewcvs/yast?rev=55800&view=rev Log: - use new logging functions Modified: trunk/storage/libstorage/src/Storage.cc Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Thu Feb 26 19:45:23 2009 @@ -471,7 +471,7 @@ } else { - y2milestone( "inactive VG %s", i->c_str() ); + y2mil("inactive VG " << *i); v->unuseDev(); delete( v ); } @@ -513,7 +513,7 @@ } else { - y2milestone( "inactive DMRAID %s", i->c_str() ); + y2mil("inactive DMRAID " << *i); v->unuseDev(); delete( v ); } @@ -629,8 +629,7 @@ data.dev[pos] = '/'; pos = data.dev.find('!',pos+1); } - y2milestone( "name sysfs:%s parted:%s", data.name.c_str(), - data.dev.c_str() ); + y2mil("name sysfs:" << data.name << " parted:" << data.dev); Disk * d = NULL; switch( data.typ ) { @@ -861,7 +860,7 @@ string bname( name ); string::size_type pos = bname.rfind( '.' ); bname.erase( pos ); - y2milestone( "name:%s bname:%s", name.c_str(), bname.c_str() ); + y2mil("name:" << name << " bname:" << bname); if( access( bname.c_str(), R_OK )==0 ) { if( !testFilesEqual( bname, name ) ) @@ -985,8 +984,7 @@ int ret = 0; bool done = false; assertInit(); - y2milestone( "disk:%s type:%d start:%ld size:%ld", disk.c_str(), - type, start, size ); + y2mil("disk:" << disk << " type:" << type << " start:" << start << " size:" << size); if( readonly ) { ret = STORAGE_CHANGE_READONLY; @@ -1027,7 +1025,7 @@ { ret = checkCache(); } - y2milestone( "ret:%d device:%s", ret, ret?"":device.c_str() ); + y2mil("ret:" << ret << " device:" << (ret?"":device)); return( ret ); } @@ -1039,8 +1037,7 @@ int ret = 0; bool done = false; assertInit(); - y2milestone( "disk:%s type:%d start:%lld sizeK:%lld", disk.c_str(), - type, start, sizeK ); + y2mil("disk:" << disk << " type:" << type << " start:" << start << " sizeK:" << sizeK); if( readonly ) { ret = STORAGE_CHANGE_READONLY; @@ -1091,7 +1088,7 @@ { ret = STORAGE_DISK_NOT_FOUND; } - y2milestone( "ret:%d device:%s", ret, ret?"":device.c_str() ); + y2mil("ret:" << ret << " device:" << (ret?"":device)); return( ret ); } @@ -1102,7 +1099,7 @@ int ret = 0; bool done = false; assertInit(); - y2milestone( "disk:%s sizeK:%lld", disk.c_str(), sizeK ); + y2mil("disk:" << disk << " sizeK:" << sizeK); if( readonly ) { ret = STORAGE_CHANGE_READONLY; @@ -1141,7 +1138,7 @@ { ret = STORAGE_DISK_NOT_FOUND; } - y2milestone( "ret:%d device:%s", ret, ret?"":device.c_str() ); + y2mil("ret:" << ret << " device:" << (ret?"":device)); return( ret ); } @@ -1152,7 +1149,7 @@ int ret = 0; bool done = false; assertInit(); - y2milestone( "disk:%s type:%u", disk.c_str(), type ); + y2mil("disk:" << disk << " type:" << type); DiskIterator i = findDisk( disk ); if( i != dEnd() ) { @@ -1172,7 +1169,7 @@ { ret = STORAGE_DISK_NOT_FOUND; } - y2milestone( "ret:%d device:%s", ret, ret?"":device.c_str() ); + y2mil("ret:" << ret << " device:" << (ret?"":device)); return( ret ); } @@ -1183,7 +1180,7 @@ int ret = 0; bool done = false; assertInit(); - y2milestone( "disk:%s type:%u", disk.c_str(), type ); + y2mil("disk:" << disk << " type:" << type); DiskIterator i = findDisk( disk ); if( readonly ) { @@ -1221,7 +1218,7 @@ { ret = STORAGE_DISK_NOT_FOUND; } - y2milestone( "ret:%d device:%s", ret, ret?"":device.c_str() ); + y2mil("ret:" << ret << " device:" << (ret?"":device)); return( ret ); } @@ -1231,7 +1228,7 @@ unsigned long long ret = 0; bool done = false; assertInit(); - y2milestone( "disk:%s size:%ld", disk.c_str(), size ); + y2mil("disk:" << disk << " size:" << size); DiskIterator i = findDisk( disk ); if( i != dEnd() ) { @@ -1247,7 +1244,7 @@ ret = i->cylinderToKb( size ); } } - y2milestone( "ret:%lld", ret ); + y2mil("ret:" << ret); return( ret ); } @@ -1257,7 +1254,7 @@ unsigned long ret = 0; bool done = false; assertInit(); - y2milestone( "disk:%s sizeK:%lld", disk.c_str(), sizeK ); + y2mil("disk:" << disk << " sizeK:" << sizeK); DiskIterator i = findDisk( disk ); if( i != dEnd() ) { @@ -1273,7 +1270,7 @@ ret = i->kbToCylinder( sizeK ); } } - y2milestone( "ret:%ld", ret ); + y2mil("ret:" << ret); return( ret ); } @@ -1282,7 +1279,7 @@ { int ret = 0; assertInit(); - y2milestone( "partition:%s", partition.c_str() ); + y2mil("partition:" << partition); VolIterator vol; ContIterator cont; if( readonly ) @@ -1354,8 +1351,7 @@ { int ret = 0; assertInit(); - y2milestone( "partition:%s start:%ld size:%ld", partition.c_str(), - start, size ); + y2mil("partition:" << partition << " start:" << start << " size:" << size); VolIterator vol; ContIterator cont; if( readonly ) @@ -1461,7 +1457,7 @@ { int ret = 0; assertInit(); - y2milestone( "partition:%s id:%x", partition.c_str(), id ); + y2mil("partition:" << partition << " id:" << hex << id); VolIterator vol; ContIterator cont; if( readonly ) @@ -1529,8 +1525,7 @@ { int ret = 0; assertInit(); - y2milestone( "partition:%s newCyl:%lu ignoreFs:%d", partition.c_str(), - sizeCyl, ignoreFs ); + y2mil("partition:" << partition << " newCyl:" << sizeCyl << " ignoreFs:" << ignoreFs); VolIterator vol; ContIterator cont; if( readonly ) @@ -1591,7 +1586,7 @@ { int ret = 0; assertInit(); - y2milestone( "partition:%s", partition.c_str() ); + y2mil("partition:" << partition); VolIterator vol; ContIterator cont; if( readonly ) @@ -1751,7 +1746,7 @@ int ret = 0; bool done = false; assertInit(); - y2milestone( "disk:%s label:%s", disk.c_str(), label.c_str() ); + y2mil("disk:" << disk << " label:" << label); if( readonly ) { @@ -1793,7 +1788,7 @@ int ret = 0; bool done = false; assertInit(); - y2milestone( "disk:%s value:%d", disk.c_str(), value ); + y2mil("disk:" << disk << " value:" << value); if( readonly ) { @@ -1854,8 +1849,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s format:%d type:%s", device.c_str(), format, - Volume::fsTypeString(fs).c_str() ); + y2mil("device:" << device << " format:" << format << " type:" << Volume::fsTypeString(fs)); VolIterator vol; ContIterator cont; if( readonly ) @@ -1883,7 +1877,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s label:%s", device.c_str(), label.c_str() ); + y2mil("device:" << device << " label:" << label); VolIterator vol; ContIterator cont; if( readonly ) @@ -1911,7 +1905,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s", device.c_str() ); + y2mil("device:" << device); VolIterator vol; ContIterator cont; if( readonly ) @@ -1935,7 +1929,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s opts:%s", device.c_str(), opts.c_str() ); + y2mil("device:" << device << " opts:" << opts); VolIterator vol; ContIterator cont; if( readonly ) @@ -1963,7 +1957,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s opts:%s", device.c_str(), opts.c_str() ); + y2mil("device:" << device << " opts:" << opts); VolIterator vol; ContIterator cont; if( readonly ) @@ -1991,7 +1985,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s txt:%s", device.c_str(), txt.c_str() ); + y2mil("device:" << device << " txt:" << txt); VolIterator vol; ContIterator cont; if( readonly ) @@ -2019,7 +2013,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s mount:%s", device.c_str(), mount.c_str() ); + y2mil("device:" << device << " mount:" << mount); VolIterator vol; ContIterator cont; if( readonly ) @@ -2047,7 +2041,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s", device.c_str()); + y2mil("device:" << device); VolIterator vol; ContIterator cont; if( findVolume( device, cont, vol ) ) @@ -2067,8 +2061,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s mby:%s", device.c_str(), - Volume::mbyTypeString(mby).c_str() ); + y2mil("device:" << device << " mby:" << Volume::mbyTypeString(mby)); VolIterator vol; ContIterator cont; if( readonly ) @@ -2096,7 +2089,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s", device.c_str()); + y2mil("device:" << device); VolIterator vol; ContIterator cont; if( findVolume( device, cont, vol ) ) @@ -2114,7 +2107,7 @@ mby = MOUNTBY_DEVICE; ret = STORAGE_VOLUME_NOT_FOUND; } - y2milestone( "ret:%d mby:%s", ret, Volume::mbyTypeString(mby).c_str()); + y2mil("ret:" << ret << " mby:" << Volume::mbyTypeString(mby)); return( ret ); } @@ -2123,7 +2116,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s options:%s", device.c_str(), options.c_str() ); + y2mil("device:" << device << " options:" << options); VolIterator vol; ContIterator cont; if( readonly ) @@ -2151,7 +2144,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s", device.c_str()); + y2mil("device:" << device); VolIterator vol; ContIterator cont; if( findVolume( device, cont, vol ) ) @@ -2162,7 +2155,7 @@ { ret = STORAGE_VOLUME_NOT_FOUND; } - y2milestone( "ret:%d options:%s", ret, options.c_str() ); + y2mil("ret:" << ret << " options:" << options); return( ret ); } @@ -2171,7 +2164,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s options:%s", device.c_str(), options.c_str() ); + y2mil("device:" << device << " options:" << options); VolIterator vol; ContIterator cont; if( readonly ) @@ -2206,7 +2199,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s options:%s", device.c_str(), options.c_str() ); + y2mil("device:" << device << " options:" << options); VolIterator vol; ContIterator cont; if( readonly ) @@ -2238,7 +2231,7 @@ int Storage::setCrypt( const string& device, bool val ) { - y2milestone( "device:%s val:%d", device.c_str(), val ); + y2mil("device:" << device << " val:" << val); return( setCryptType( device, val, ENC_LUKS )); } @@ -2247,7 +2240,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s val:%d type:%d", device.c_str(), val, typ ); + y2mil("device:" << device << " val:" << val << " type:" << typ); VolIterator vol; ContIterator cont; if( readonly ) @@ -2275,7 +2268,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s", device.c_str()); + y2mil("device:" << device); VolIterator vol; ContIterator cont; if( findVolume( device, cont, vol ) ) @@ -2286,7 +2279,7 @@ { ret = STORAGE_VOLUME_NOT_FOUND; } - y2milestone( "ret:%d val:%d", ret, val ); + y2mil("ret:" << ret << " val:" << val); return( ret ); } @@ -2295,9 +2288,9 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s l:%zu", device.c_str(), pwd.length() ); + y2mil("device:" << device << " l:" << pwd.length()); #ifdef DEBUG_LOOP_CRYPT_PASSWORD - y2milestone( "password:%s", pwd.c_str() ); + y2mil("password:" << pwd); #endif VolIterator vol; @@ -2326,7 +2319,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s", device.c_str() ); + y2mil("device:" << device); VolIterator vol; if( readonly ) @@ -2354,7 +2347,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s", device.c_str() ); + y2mil("device:" << device); pwd.clear(); VolIterator vol; @@ -2371,7 +2364,7 @@ ret = checkCache(); } #ifdef DEBUG_LOOP_CRYPT_PASSWORD - y2milestone( "password:%s", pwd.c_str() ); + y2mil("password:" << pwd); #endif y2mil("ret:" << ret); return( ret ); @@ -2382,7 +2375,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s val:%d", device.c_str(), val ); + y2mil("device:" << device << " val:" << val); VolIterator vol; ContIterator cont; if( readonly ) @@ -2410,7 +2403,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s", device.c_str()); + y2mil("device:" << device); VolIterator vol; ContIterator cont; if( findVolume( device, cont, vol ) ) @@ -2421,7 +2414,7 @@ { ret = STORAGE_VOLUME_NOT_FOUND; } - y2milestone( "ret:%d val:%d", ret, val ); + y2mil("ret:" << ret << " val:" << val); return( ret ); } @@ -2443,8 +2436,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s newSizeMb:%llu ignoreFs:%d", device.c_str(), - newSizeMb, ignoreFs ); + y2mil("device:" << device << " newSizeMb:" << newSizeMb << " ignoreFs:" << ignoreFs); VolIterator vol; ContIterator cont; if( readonly ) @@ -2477,7 +2469,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s", device.c_str() ); + y2mil("device:" << device); VolIterator vol; ContIterator cont; if( readonly ) @@ -2505,7 +2497,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s", device.c_str() ); + y2mil("device:" << device); VolIterator vol; ContIterator cont; @@ -2590,7 +2582,7 @@ { int ret = 0; assertInit(); - y2milestone( "name:%s", name.c_str() ); + y2mil("name:" << name); LvmVgIterator i = findLvmVg( name ); if( readonly ) { @@ -2681,8 +2673,7 @@ { int ret = 0; assertInit(); - y2milestone( "vg:%s name:%s sizeM:%llu stripe:%u", vg.c_str(), - name.c_str(), sizeM, stripe ); + y2mil("vg:" << vg << " name:" << name << " sizeM:" << sizeM << " stripe:" << stripe); LvmVgIterator i = findLvmVg( vg ); if( readonly ) { @@ -2700,7 +2691,7 @@ { ret = checkCache(); } - y2milestone( "ret:%d device:%s", ret, ret?"":device.c_str() ); + y2mil("ret:" << ret << " device:" << (ret?"":device)); return( ret ); } @@ -2729,7 +2720,7 @@ { int ret = 0; assertInit(); - y2milestone( "vg:%s name:%s", vg.c_str(), name.c_str() ); + y2mil("vg:" << vg << " name:" << name); LvmVgIterator i = findLvmVg( vg ); if( readonly ) { @@ -2757,8 +2748,7 @@ { int ret = 0; assertInit(); - y2milestone( "vg:%s name:%s stripe:%lu", vg.c_str(), name.c_str(), - stripe ); + y2mil("vg:" << vg << " name:" << name << " stripe:" << stripe); LvmVgIterator i = findLvmVg( vg ); if( readonly ) { @@ -2786,8 +2776,7 @@ { int ret = 0; assertInit(); - y2milestone( "vg:%s name:%s stripeSize:%llu", vg.c_str(), name.c_str(), - stripeSize ); + y2mil("vg:" << vg << " name:" << name << " stripeSize:" << stripeSize); LvmVgIterator i = findLvmVg( vg ); if( readonly ) { @@ -2900,7 +2889,7 @@ if (haveMd(md)) nr = md->unusedNumber(); device = "/dev/md" + decString(nr); - y2milestone("ret:%d nr:%d device:%s", ret, nr, device.c_str()); + y2mil("ret:" << ret << " nr:" << nr << " device:" << device); return ret; } @@ -2996,7 +2985,7 @@ { ret = checkCache(); } - y2milestone( "ret:%d device:%s", ret, ret==0?device.c_str():"" ); + y2mil("ret:" << ret << " device:" << (ret==0?device:"")); return( ret ); } @@ -3004,7 +2993,7 @@ { int ret = 0; assertInit(); - y2milestone( "name:%s destroySb:%d", name.c_str(), destroySb ); + y2mil("name:" << name << " destroySb:" << destroySb); if( readonly ) { ret = STORAGE_CHANGE_READONLY; @@ -3034,7 +3023,7 @@ { int ret = 0; assertInit(); - y2milestone( "name:%s dev:%s", name.c_str(), dev.c_str() ); + y2mil("name:" << name << " dev:" << dev); if( readonly ) { ret = STORAGE_CHANGE_READONLY; @@ -3064,7 +3053,7 @@ { int ret = 0; assertInit(); - y2milestone( "name:%s dev:%s", name.c_str(), dev.c_str() ); + y2mil("name:" << name << " dev:" << dev); if( readonly ) { ret = STORAGE_CHANGE_READONLY; @@ -3094,7 +3083,7 @@ { int ret = 0; assertInit(); - y2milestone( "name:%s rtype:%d", name.c_str(), rtype ); + y2mil("name:" << name << " rtype:" << rtype); if( readonly ) { ret = STORAGE_CHANGE_READONLY; @@ -3124,7 +3113,7 @@ { int ret = 0; assertInit(); - y2milestone( "name:%s dev:%lu", name.c_str(), chunk ); + y2mil("name:" << name << " chunk:" << chunk); if( readonly ) { ret = STORAGE_CHANGE_READONLY; @@ -3154,7 +3143,7 @@ { int ret = 0; assertInit(); - y2milestone( "name:%s parity:%d", name.c_str(), ptype ); + y2mil("name:" << name << " parity:" << ptype); if( readonly ) { ret = STORAGE_CHANGE_READONLY; @@ -3184,7 +3173,7 @@ { int ret = 0; assertInit(); - y2milestone( "name:%s", name.c_str() ); + y2mil("name:" << name); unsigned num = 0; MdCo *md = NULL; if( Md::mdStringNum( name, num ) && haveMd(md) ) @@ -3200,7 +3189,7 @@ { int ret = 0; assertInit(); - y2milestone("name:%s", name.c_str()); + y2mil("name:" << name); unsigned num = 0; if (ret == 0 && !Md::mdStringNum(name, num)) { @@ -3214,7 +3203,7 @@ else ret = STORAGE_MD_NOT_FOUND; } - y2milestone("ret:%d", ret); + y2mil("ret:" << ret); return ret; } @@ -3265,8 +3254,7 @@ break; } - y2milestone ("type:%d smallest:%llu sum:%llu size:%llu", md_type, - smallestK, sumK, sizeK); + y2mil("type:" << md_type << " smallest:" << smallestK << " sum:" << sumK << " size:" << sizeK); return ret; } @@ -3383,10 +3371,9 @@ { int ret = 0; assertInit(); - y2milestone( "lname:%s reuseExisting:%d sizeK:%llu mp:%s", lname.c_str(), - reuseExisting, sizeK, mp.c_str() ); + y2mil("lname:" << lname << " reuseExisting:" << reuseExisting << " sizeK:" << sizeK << " mp:" << mp); #ifdef DEBUG_LOOP_CRYPT_PASSWORD - y2milestone( "pwd:%s", pwd.c_str() ); + y2mil("pwd:" << pwd); #endif if( readonly ) { @@ -3444,7 +3431,7 @@ { ret = checkCache(); } - y2milestone( "ret:%d device:%s", ret, ret==0?device.c_str():"" ); + y2mil("ret:" << ret << " device:" << (ret==0?device:"")); return( ret ); } @@ -3454,8 +3441,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s lname:%s reuse:%d sizeK:%lld", device.c_str(), - lname.c_str(), reuseExisting, sizeK ); + y2mil("device:" << device << " lname:" << lname << " reuse:" << reuseExisting << " sizeK:" << sizeK); if( readonly ) { ret = STORAGE_CHANGE_READONLY; @@ -3481,7 +3467,7 @@ { int ret = 0; assertInit(); - y2milestone( "lname:%s removeFile:%d", lname.c_str(), removeFile ); + y2mil("lname:" << lname << " removeFile:" << removeFile); if( readonly ) { ret = STORAGE_CHANGE_READONLY; @@ -3679,7 +3665,7 @@ y2mil(b.str()); b.str(""); todo.sort( cont_less<commitAction>() ); - y2milestone( "stage %d", stage ); + y2mil("stage:" << stage); b << "sorted co <"; for( list<Container*>::const_iterator i=co.begin(); i!=co.end(); ++i ) { @@ -3752,13 +3738,13 @@ SystemCmd c; CPair p = cPair( notLoop ); int ret = 0; - y2milestone( "empty:%d", p.empty() ); + y2mil("empty:" << p.empty()); if( !p.empty() ) { ret = commitPair( p, notLoop ); } p = cPair( isLoop ); - y2milestone( "empty:%d", p.empty() ); + y2mil("empty:" << p.empty()); if( ret==0 && !p.empty() ) { ret = commitPair( p, isLoop ); @@ -3795,7 +3781,7 @@ Storage::commitPair( CPair& p, bool (* fnc)( const Container& ) ) { int ret = 0; - y2milestone( "p.length:%d", p.length() ); + y2mil("p.length:" << p.length()); CommitStage a[] = { DECREASE, INCREASE, FORMAT, MOUNT }; CommitStage* pt = a; while( unsigned(pt-a) < lengthof(a) ) @@ -3848,7 +3834,7 @@ delete( *ac ); ++ac; } - y2milestone( "stage:%d new_pair:%d", *pt, new_pair ); + y2mil("stage:" << *pt << " new_pair:" << new_pair); if( new_pair ) { p = cPair( fnc ); @@ -3938,7 +3924,7 @@ bool Storage::checkDmMapsTo( const string& dev ) { bool ret = false; - y2milestone( "dev:%s", dev.c_str() ); + y2mil("dev:" << dev); VPair vp = vPair( isDmContainer ); VolIterator v=vp.begin(); while( !ret && v!=vp.end() ) @@ -4662,9 +4648,8 @@ ++c; ret = c!=cp.end(); } - y2milestone( "device:%s ret:%d c->device:%s v->device:%s", device.c_str(), - ret, ret?c->device().c_str():"nil", - ret?v->device().c_str():"nil" ); + y2mil("device:" << device << " ret:" << ret << " c->device:" << (ret?c->device():"NULL") << + " v->device:" << (ret?v->device():"NULL")); return( ret ); } @@ -4749,7 +4734,7 @@ else d = normalizeDevice( device ); if( !label.empty() || !uuid.empty() ) - y2milestone( "label:%s uuid:%s", label.c_str(), uuid.c_str() ); + y2mil("label:" << label << " uuid:" << uuid); VPair p = vPair( also_del?NULL:Volume::notDeleted ); v = p.begin(); if( label.empty() && uuid.empty() ) @@ -4886,7 +4871,7 @@ void Storage::progressBarCb( const string& id, unsigned cur, unsigned max ) { - y2milestone( "id:%s cur:%d max:%d", id.c_str(), cur, max ); + y2mil("id:" << id << " cur:" << cur << " max:" << max); CallbackProgressBar cb = getCallbackProgressBarTheOne(); if( cb ) (*cb)( id, cur, max ); @@ -4894,7 +4879,7 @@ void Storage::showInfoCb( const string& info ) { - y2milestone( "INSTALL INFO:%s", info.c_str() ); + y2mil("INSTALL INFO:" << info); CallbackShowInstallInfo cb = getCallbackShowInstallInfoTheOne(); lastAction = info; if( cb ) @@ -4903,7 +4888,7 @@ void Storage::infoPopupCb( const string& info ) { - y2milestone( "INFO POPUP:%s", info.c_str() ); + y2mil("INFO POPUP:" << info); CallbackInfoPopup cb = getCallbackInfoPopupTheOne(); if( cb ) (*cb)( info ); @@ -4917,7 +4902,7 @@ bool Storage::yesnoPopupCb( const string& info ) { - y2milestone( "YESNO POPUP:%s", info.c_str() ); + y2mil("YESNO POPUP:" << info); CallbackYesNoPopup cb = getCallbackYesNoPopupTheOne(); if( cb ) return (*cb)( info ); @@ -5021,7 +5006,7 @@ { ret = disks_allowed && findDisk( dev )!=dEnd(); } - y2milestone( "dev:%s ret:%d", dev.c_str(), ret ); + y2mil("dev:" << dev << " ret:" << ret); return( ret ); } @@ -5029,8 +5014,7 @@ unsigned dmnum, unsigned long long siz, storage::EncryptType typ ) { - y2milestone( "dev:%s dm:%s dmn:%u sizeK:%llu", dev.c_str(), dm.c_str(), - dmnum, siz ); + y2mil("dev:" << dev << " dm:" << dm << " dmnum:" << dmnum << " sizeK:" << siz); bool ret=false; VolIterator v; if( dm.find("/temporary-cryptsetup-")==string::npos && @@ -5052,7 +5036,7 @@ while( v!=p.end() && v->device()!=dev ) ++v; bool ret = v!=p.end(); - y2milestone( "dev:%s ret:%d", dev.c_str(), ret ); + y2mil("dev:" << dev << " ret:" << ret); return( ret ); } @@ -5071,8 +5055,7 @@ { ret = &(*v); } - y2milestone( "dev:%s ret:%s", dev.c_str(), - ret?ret->device().c_str():"nil" ); + y2mil("dev:" << dev << " ret:" << (ret?ret->device():"NULL")); return( ret ); } @@ -5095,7 +5078,7 @@ { ret = v->canUseDevice(); } - y2milestone( "dev:%s ret:%d", dev.c_str(), ret ); + y2mil("dev:" << dev << " ret:" << ret); return( ret ); } @@ -5135,7 +5118,7 @@ ret = di->device(); } } - y2milestone( "majmin %s ret:%s", majmin.c_str(), ret.c_str() ); + y2mil("majmin:" << majmin << " ret:" << ret); return( ret ); } @@ -5151,13 +5134,13 @@ } else ret = v->sizeK(); - y2milestone( "dev:%s ret:%llu", dev.c_str(), ret ); + y2mil("dev:" << dev << " ret:" << ret); return( ret ); } int Storage::removeContainer( Container* val, bool call_del ) { - y2milestone( "name:%s call_del:%d", val->name().c_str(), call_del ); + y2mil("name:" << val->name() << " call_del:" << call_del); int ret = 0; CIter i=cont.begin(); while( i!=cont.end() && *i!=val ) @@ -5233,7 +5216,7 @@ { bool ret = false; assertInit(); - y2milestone( "device:%s", device.c_str() ); + y2mil("device:" << device); VolIterator vol; ProcMounts mountData( this ); if( findVolume( device, vol ) ) @@ -5247,7 +5230,7 @@ { mp = mountData.getMount( device ); } - y2milestone( "ret:%d mp:%s", ret, mp.c_str() ); + y2mil("ret:" << ret << " mp:" << mp); return( ret ); } @@ -5256,7 +5239,7 @@ { bool ret = false; assertInit(); - y2milestone( "device:%s", device.c_str() ); + y2mil("device:" << device); VolIterator vol; if( !readonly && findVolume( device, vol ) ) { @@ -5276,8 +5259,7 @@ { bool ret = true; assertInit(); - y2milestone( "device:%s mp:%s ro:%d opts:%s", device.c_str(), mp.c_str(), - ro, opts.c_str() ); + y2mil("device:" << device << " mp:" << mp << " ro:" << ro << " opts:" << opts); VolIterator vol; if( !readonly && findVolume( device, vol ) ) { @@ -5310,7 +5292,7 @@ bool ret = false; VolIterator vol; assertInit(); - y2milestone( "dir:%s", dir.c_str() ); + y2mil("dir:" << dir); EtcFstab *fstab = new EtcFstab( dir, true ); list<FstabEntry> le; fstab->getEntries( le ); @@ -5381,7 +5363,7 @@ bool ret = false; assertInit(); resize_free = df_free = used = 0; - y2milestone( "device:%s use_cache:%d", device.c_str(), use_cache ); + y2mil("device:" << device << " use_cache:" << use_cache); VolIterator vol; if( findVolume( device, vol ) ) { @@ -5498,9 +5480,8 @@ } } if( ret ) - y2milestone( "resize_free:%llu df_free:%llu used:%llu", - resize_free, df_free, used ); - y2milestone( "ret:%d win:%d", ret, win ); + y2mil("resize_free:" << resize_free << " df_free:" << df_free << " used:" << used); + y2mil("ret:" << ret << " win:" << win); return( ret ); } @@ -5509,8 +5490,8 @@ unsigned long long used, bool win, bool efi, bool resize_ok ) { - y2milestone( "device:%s df_free:%llu resize_free:%llu used:%llu win:%d efi:%d", - device.c_str(), df_free, resize_free, used, win, efi ); + y2mil("device:" << device << " df_free:" << df_free << " resize_free:" << resize_free << " used:" << used << + " win:" << win << " efi:" << efi); FreeInfo inf( df_free, resize_free, used, win, efi, resize_ok ); freeInfo[device] = inf; @@ -5533,10 +5514,10 @@ efi = i->second.efi; resize_ok = i->second.rok; } - y2milestone( "device:%s ret:%d", device.c_str(), ret ); + y2mil("device:" << device << " ret:" << ret); if( ret ) - y2milestone( "df_free:%llu resize_free:%llu used:%llu win:%d efi:%d resize_ok:%d", - df_free, resize_free, used, win, efi, resize_ok ); + y2mil("df_free:" << df_free << " resize_free:" << resize_free << " used:" << used << + " win:" << win << " efi:" << efi << " resize_ok:" << resize_ok); return( ret ); } @@ -5553,7 +5534,7 @@ { int ret = readonly?STORAGE_CHANGE_READONLY:0; assertInit(); - y2milestone( "name:%s", name.c_str() ); + y2mil("name:" << name); if( ret==0 ) { if(checkBackupState(name)) @@ -5568,7 +5549,7 @@ y2mil( "states:" << backupStates() ); y2mil("ret:" << ret); if( ret==0 ) - y2milestone( "comp:%d", equalBackupStates( name, "", true )); + y2mil("comp:" << equalBackupStates(name, "", true)); return( ret ); } @@ -5577,7 +5558,7 @@ { int ret = readonly?STORAGE_CHANGE_READONLY:0; assertInit(); - y2milestone( "name:%s", name.c_str() ); + y2mil("name:" << name); if( ret==0 ) { if( !name.empty() ) @@ -5604,7 +5585,7 @@ { int ret = readonly?STORAGE_CHANGE_READONLY:0; assertInit(); - y2milestone( "name:%s", name.c_str() ); + y2mil("name:" << name); if( ret==0 ) { map<string,CCont>::iterator b = backups.find( name ); @@ -5630,7 +5611,7 @@ { bool ret = false; assertInit(); - y2milestone( "name:%s", name.c_str() ); + y2mil("name:" << name); map<string,CCont>::iterator i = backups.find( name ); ret = i!=backups.end(); y2mil("ret:" << ret); @@ -5752,9 +5733,8 @@ { int ret = readonly?STORAGE_CHANGE_READONLY:0; assertInit(); - y2milestone( "device:%s mount:%s vfs:%s opts:%s freq:%u passno:%u", - device.c_str(), mount.c_str(), vfs.c_str(), options.c_str(), - freq, passno ); + y2mil("device:" << device << " mount:" << mount << " vfs:" << vfs << " opts:" << options << + " freq:" << freq << " passno:" << passno); if( ret==0 && (device.empty()||mount.empty()||vfs.empty())) { ret = STORAGE_INVALID_FSTAB_VALUE; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55799 - /trunk/storage/libstorage/src/AppUtil.h
by aschnell＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: aschnell Date: Thu Feb 26 17:51:58 2009 New Revision: 55799 URL: http://svn.opensuse.org/viewcvs/yast?rev=55799&view=rev Log: - removed unneeded include Modified: trunk/storage/libstorage/src/AppUtil.h Modified: trunk/storage/libstorage/src/AppUtil.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.h… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.h (original) +++ trunk/storage/libstorage/src/AppUtil.h Thu Feb 26 17:51:58 2009 @@ -1,7 +1,6 @@ #ifndef APP_UTIL_H #define APP_UTIL_H -#include <time.h> #include <libintl.h> #include <string.h> #include <cstdarg> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55798 - in /trunk/qt-pkg: package/yast2-qt-pkg.changes src/YQPkgList.cc src/YQPkgObjList.cc
by tgoettlicher＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: tgoettlicher Date: Thu Feb 26 17:04:01 2009 New Revision: 55798 URL: http://svn.opensuse.org/viewcvs/yast?rev=55798&view=rev Log: fixed bnc #469203: sort order in package list Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPkgList.cc trunk/qt-pkg/src/YQPkgObjList.cc Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.chan… ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Thu Feb 26 17:04:01 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Feb 26 17:02:30 CET 2009 - tgoettlicher(a)suse.de + +- Fixed incorrect sort order in package list (bnc #469203) + +------------------------------------------------------------------- Tue Feb 24 16:32:35 CET 2009 - tgoettlicher(a)suse.de - Fixed segfault when switching filters and version tab is shown Modified: trunk/qt-pkg/src/YQPkgList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgList.cc?rev=5579… ============================================================================== --- trunk/qt-pkg/src/YQPkgList.cc (original) +++ trunk/qt-pkg/src/YQPkgList.cc Thu Feb 26 17:04:01 2009 @@ -88,7 +88,7 @@ header()->setSortIndicatorShown( true ); header()->setClickable( true ); - sortByColumn( nameCol(), Qt::AscendingOrder ); + sortByColumn( statusCol(), Qt::AscendingOrder ); setAllColumnsShowFocus( true ); setIconSize( QSize( 22, 16 ) ); Modified: trunk/qt-pkg/src/YQPkgObjList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgObjList.cc?rev=5… ============================================================================== --- trunk/qt-pkg/src/YQPkgObjList.cc (original) +++ trunk/qt-pkg/src/YQPkgObjList.cc Thu Feb 26 17:04:01 2009 @@ -1479,8 +1479,7 @@ { if ( col == nameCol() ) { - // locale aware sort - return ( strcoll( this->zyppObj()->name().c_str(), other->zyppObj()->name().c_str() ) < 0 ); + return ( strcmp( this->zyppObj()->name().c_str(), other->zyppObj()->name().c_str() ) < 0 ); } if ( col == summaryCol() ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55797 - in /trunk/sudo/src: complex.ycp dialog-spec.ycp
by kmachalkova＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: kmachalkova Date: Thu Feb 26 16:23:53 2009 New Revision: 55797 URL: http://svn.opensuse.org/viewcvs/yast?rev=55797&view=rev Log: Fixed command editing and deleting Modified: trunk/sudo/src/complex.ycp trunk/sudo/src/dialog-spec.ycp Modified: trunk/sudo/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/complex.ycp?rev=55797&r… ============================================================================== --- trunk/sudo/src/complex.ycp (original) +++ trunk/sudo/src/complex.ycp Thu Feb 26 16:23:53 2009 @@ -152,7 +152,7 @@ } string AddCommandDialog(string c, string p) { - string new_command = c + p; + string new_command = ""; list <string> items = Sudo::GetAliasNames("command"); Modified: trunk/sudo/src/dialog-spec.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/dialog-spec.ycp?rev=557… ============================================================================== --- trunk/sudo/src/dialog-spec.ycp (original) +++ trunk/sudo/src/dialog-spec.ycp Thu Feb 26 16:23:53 2009 @@ -11,12 +11,10 @@ include "sudo/complex.ycp"; void RedrawCmndTable (list <string> commands) { - if (commands != []) { - list <term> items = UpdateCmdList(commands); + list <term> items = UpdateCmdList(commands); - UI::ChangeWidget(`id("commands"),`Items, items); - EnableDisableButtons("command_edit", "command_remove", items); - } + UI::ChangeWidget(`id("commands"),`Items, items); + EnableDisableButtons("command_edit", "command_remove", items); } @@ -128,6 +126,7 @@ string new_command = AddCommandDialog("",""); if(new_command != "" && !contains(commands, new_command)) { + y2milestone("%1", new_command); commands = add(commands, new_command); RedrawCmndTable(commands); } @@ -137,8 +136,11 @@ term it = (term) UI::QueryWidget(`id("commands"), `Item(current_item)); string new_command = AddCommandDialog(it[1]:"", it[2]:""); - commands[current_item] = new_command; - RedrawCmndTable(commands); + if( new_command !="") + { + commands[current_item] = new_command; + RedrawCmndTable(commands); + } /* remove command */ } else if (ret == "command_remove") { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55796 - in /trunk/installation: package/yast2-installation.changes src/modules/Vendor.ycp
by ug＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: ug Date: Thu Feb 26 16:01:13 2009 New Revision: 55796 URL: http://svn.opensuse.org/viewcvs/yast?rev=55796&view=rev Log: RPMs via driverupdate were not possible Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/modules/Vendor.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Feb 26 16:01:13 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Feb 26 16:00:44 CET 2009 - ug(a)suse.de + +- RPMs via driverupdate were not possible + +------------------------------------------------------------------- Tue Feb 24 13:30:15 CET 2009 - locilka(a)suse.cz - Added support for .xz images deployment (bnc #476079). Modified: trunk/installation/src/modules/Vendor.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/Vendor.… ============================================================================== --- trunk/installation/src/modules/Vendor.ycp (original) +++ trunk/installation/src/modules/Vendor.ycp Thu Feb 26 16:01:13 2009 @@ -53,7 +53,7 @@ "echo \"Installing driver update\" >> " + Directory::logdir + "/y2logRPM ; " + "for i in /tmp/update/[0-9]*/install ; do " + " [ -f \"$i/update.tar.gz\" ] && /bin/tar -zxf \"$i/update.tar.gz\" ; " + - " rpm -Uv $i/*.rpm 2 >> " + Directory::logdir + "/y2logRPM ; " + + " rpm -Uv $i/*.rpm 2>> " + Directory::logdir + "/y2logRPM ; " + " [ -f \"$i/update.post\" ] && /bin/chmod +x \"$i/update.post\" && \"$i/update.post\" \"$i\" ; " + "done"); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0