[yast-commit] r67271 - in /branches/SuSE-Code-11-SP2-Branch/storage: libstorage/src/ package/
Author: fehr Date: Tue Jan 24 19:13:05 2012 New Revision: 67271 URL: http://svn.opensuse.org/viewcvs/yast?rev=67271&view=rev Log: make sure error popup contains always valid info Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/BtrfsCo.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dasd.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/DmCo.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/DmPartCo.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/DmraidCo.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/LoopCo.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/LvmVg.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdCo.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdPartCo.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/NfsCo.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.h branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/TmpfsCo.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.cc?rev=67271&r1=67270&r2=67271&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.cc Tue Jan 24 19:13:05 2012 @@ -335,8 +335,7 @@ SystemCmd c; while( ret==0 && d!=devs.end() ) { - if( !silent ) - getStorage()->showInfoCb(extendText(true, *d)); + getStorage()->showInfoCb(extendText(true, *d),silent); string cmd = BTRFSBIN " device add " + quote(*d) + " " + m; c.execute( cmd ); if( c.retcode()==0 ) @@ -366,8 +365,7 @@ SystemCmd c; while( ret==0 && d!=devs.end() ) { - if( !silent ) - getStorage()->showInfoCb(reduceText(true, *d)); + getStorage()->showInfoCb(reduceText(true, *d),silent); string cmd = BTRFSBIN " device delete " + quote(*d) + " " + m; c.execute( cmd ); if( c.retcode()==0 ) @@ -399,8 +397,7 @@ { if( i->deleted() ) { - if( !silent ) - getStorage()->showInfoCb( deleteSubvolText(true,i->path())); + getStorage()->showInfoCb( deleteSubvolText(true,i->path()),silent); c.execute( cmd + i->path() ); if( c.retcode()==0 ) i->setDeleted(false); @@ -428,8 +425,7 @@ { if( i->created() ) { - if( !silent ) - getStorage()->showInfoCb( createSubvolText(true,i->path())); + getStorage()->showInfoCb( createSubvolText(true,i->path()),silent); y2mil( "dir:" << m << " path:" << i->path() ); string path = m + "/" + i->path(); string dir = path.substr( 0, path.find_last_of( "/" ) ); Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/BtrfsCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/BtrfsCo.cc?rev=67271&r1=67270&r2=67271&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/BtrfsCo.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/BtrfsCo.cc Tue Jan 24 19:13:05 2012 @@ -477,10 +477,7 @@ Btrfs *b = dynamic_cast<Btrfs *>(v); if( b != NULL ) { - if( !b->isSilent() ) - { - getStorage()->showInfoCb( b->removeText(true) ); - } + getStorage()->showInfoCb( b->removeText(true), b->isSilent() ); ret = b->clearSignature(); if( ret==0 && !removeFromList(v) ) ret = BTRFS_REMOVE_NO_BTRFS; Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dasd.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dasd.cc?rev=67271&r1=67270&r2=67271&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dasd.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dasd.cc Tue Jan 24 19:13:05 2012 @@ -292,10 +292,7 @@ int Dasd::doFdasd() { int ret = 0; - if( !silent ) - { - getStorage()->showInfoCb( fdasdText() ); - } + getStorage()->showInfoCb( fdasdText(), silent ); string inpname = getStorage()->tmpDir()+"/fdasd_inp"; ofstream inpfile( inpname.c_str() ); classic(inpfile); @@ -466,11 +463,7 @@ devs.push_back( undevDevice((*i)->device()) ); } y2mil("devs:" << devs); - if( !silent ) - { - Text txt = dasdfmtTexts(true, devs); - getStorage()->showInfoCb( txt ); - } + getStorage()->showInfoCb( dasdfmtTexts(true, devs), silent ); for( list<string>::iterator i = devs.begin(); i!=devs.end(); ++i ) { *i = "-f " + quote(normalizeDevice(*i)); Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc?rev=67271&r1=67270&r2=67271&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc Tue Jan 24 19:13:05 2012 @@ -1570,10 +1570,7 @@ { y2mil("label:" << label); int ret = 0; - if( !silent ) - { - getStorage()->showInfoCb( setDiskLabelText(true) ); - } + getStorage()->showInfoCb( setDiskLabelText(true), silent ); if( !dmp_slave ) getStorage()->removeDmMapsTo( device() ); removePresentPartitions(); @@ -1675,10 +1672,7 @@ int ret = 0; if( p != NULL ) { - if( !silent ) - { - getStorage()->showInfoCb( p->setTypeText(true) ); - } + getStorage()->showInfoCb( p->setTypeText(true), silent ); if( p->id()!=Partition::ID_LINUX && p->id()!=Partition::ID_SWAP ) p->eraseLabel(); @@ -1867,10 +1861,7 @@ if( p != NULL ) { bool call_blockdev = false; - if( !silent ) - { - getStorage()->showInfoCb( p->createText(true) ); - } + getStorage()->showInfoCb( p->createText(true), silent ); 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); @@ -2053,10 +2044,7 @@ int ret = 0; if( p != NULL ) { - if( !silent ) - { - getStorage()->showInfoCb( p->removeText(true) ); - } + getStorage()->showInfoCb( p->removeText(true), silent ); y2mil("doRemove container " << name() << " name " << p->name()); if( !dmp_slave ) { @@ -2295,10 +2283,7 @@ { bool remount = false; bool needExtend = !p->needShrink(); - if( !silent ) - { - getStorage()->showInfoCb( p->resizeText(true) ); - } + getStorage()->showInfoCb( p->resizeText(true), silent ); if( !dmp_slave && p->isMounted() ) { ret = p->umount(); Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/DmCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/DmCo.cc?rev=67271&r1=67270&r2=67271&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/DmCo.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/DmCo.cc Tue Jan 24 19:13:05 2012 @@ -399,10 +399,7 @@ int ret = 0; if( m != NULL ) { - if( !silent ) - { - getStorage()->showInfoCb( m->removeText(true) ); - } + getStorage()->showInfoCb( m->removeText(true), silent ); ret = m->prepareRemove(); if( ret==0 ) { Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/DmPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/DmPartCo.cc?rev=67271&r1=67270&r2=67271&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/DmPartCo.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/DmPartCo.cc Tue Jan 24 19:13:05 2012 @@ -583,10 +583,7 @@ int ret = p?0:DMPART_PARTITION_NOT_FOUND; if( ret==0 ) { - if( !silent ) - { - getStorage()->showInfoCb( dm->setTypeText(true) ); - } + getStorage()->showInfoCb( dm->setTypeText(true), silent ); ret = disk->doSetType( p ); } y2mil("ret:" << ret); @@ -597,10 +594,7 @@ { y2mil("label:" << labelName()); int ret = 0; - if( !silent ) - { - getStorage()->showInfoCb( setDiskLabelText(true) ); - } + getStorage()->showInfoCb( setDiskLabelText(true), silent ); getStorage()->removeDmMapsTo( device() ); removePresentPartitions(); ret = disk->doCreateLabel(); @@ -780,10 +774,7 @@ Partition *p = NULL; if( ret==0 ) { - if( !silent ) - { - getStorage()->showInfoCb( l->createText(true) ); - } + getStorage()->showInfoCb( l->createText(true), silent ); p = l->getPtr(); if( p==NULL ) ret = DMPART_PARTITION_NOT_FOUND; @@ -825,10 +816,7 @@ ret = DMPART_INVALID_VOLUME; if( ret==0 ) { - if( !silent ) - { - getStorage()->showInfoCb( l->removeText(true) ); - } + getStorage()->showInfoCb( l->removeText(true), silent ); ret = v->prepareRemove(); } if( ret==0 ) @@ -870,10 +858,7 @@ if( ret==0 ) { needExtend = !l->needShrink(); - if( !silent ) - { - getStorage()->showInfoCb( l->resizeText(true) ); - } + getStorage()->showInfoCb( l->resizeText(true), silent ); if( l->isMounted() ) { ret = l->umount(); Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/DmraidCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/DmraidCo.cc?rev=67271&r1=67270&r2=67271&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/DmraidCo.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/DmraidCo.cc Tue Jan 24 19:13:05 2012 @@ -263,10 +263,7 @@ activate_part(false); activate(false); } - if( !silent ) - { - getStorage()->showInfoCb( removeText(true) ); - } + getStorage()->showInfoCb( removeText(true), silent ); string cmd = "cd /var/log/YaST2 && echo y | " DMRAIDBIN " -E -r"; SystemCmd c; for( list<Pv>::const_iterator i=pv.begin(); i!=pv.end(); ++i ) Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/LoopCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/LoopCo.cc?rev=67271&r1=67270&r2=67271&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/LoopCo.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/LoopCo.cc Tue Jan 24 19:13:05 2012 @@ -320,10 +320,7 @@ int ret = 0; if( l != NULL ) { - if( !silent ) - { - getStorage()->showInfoCb( l->createText(true) ); - } + getStorage()->showInfoCb( l->createText(true), silent ); if( !l->createFile() ) ret = LOOP_FILE_CREATE_FAILED; if( ret==0 ) @@ -349,10 +346,7 @@ int ret = 0; if( l != NULL ) { - if( !silent ) - { - getStorage()->showInfoCb( l->removeText(true) ); - } + getStorage()->showInfoCb( l->removeText(true), silent ); ret = l->prepareRemove(); if( ret==0 ) { Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/LvmVg.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/LvmVg.cc?rev=67271&r1=67270&r2=67271&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/LvmVg.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/LvmVg.cc Tue Jan 24 19:13:05 2012 @@ -1207,10 +1207,7 @@ if( created() ) { checkConsistency(); - if( !silent ) - { - getStorage()->showInfoCb(createText(true)); - } + getStorage()->showInfoCb(createText(true),silent); string devices; if( pv_add.size()+pv.size()-pv_remove.size()<=0 ) ret = LVM_VG_HAS_NONE_PV; @@ -1265,10 +1262,7 @@ { if( !active ) activate(true); - if( !silent ) - { - getStorage()->showInfoCb(removeText(true)); - } + getStorage()->showInfoCb(removeText(true),silent); checkConsistency(); string cmd = VGREMOVEBIN " " + quote(name()); SystemCmd c( cmd ); @@ -1299,10 +1293,7 @@ while( ret==0 && d!=devs.end() ) { checkConsistency(); - if( !silent ) - { - getStorage()->showInfoCb(extendText(true, d->device)); - } + getStorage()->showInfoCb(extendText(true, d->device),silent); ret = doCreatePv(*d); if( ret==0 ) { @@ -1348,10 +1339,7 @@ while( ret==0 && d!=devs.end() ) { checkConsistency(); - if( !silent ) - { - getStorage()->showInfoCb(reduceText(true, d->device)); - } + getStorage()->showInfoCb(reduceText(true, d->device),silent); string cmd = VGREDUCEBIN " " + instSysString() + quote(name()) + " " + quote(d->realDevice()); SystemCmd c( cmd ); if( c.retcode()!=0 ) @@ -1386,10 +1374,7 @@ { if( !active ) activate(true); - if( !silent ) - { - getStorage()->showInfoCb( l->createText(true) ); - } + getStorage()->showInfoCb( l->createText(true), silent ); checkConsistency(); string cmd = LVCREATEBIN " " + instSysString() + " -l " + decString(l->getLe()); if (l->getOrigin().empty()) @@ -1440,10 +1425,7 @@ y2mil( "lv:" << *l ); if( !active ) activate(true); - if( !silent ) - { - getStorage()->showInfoCb( l->removeText(true) ); - } + getStorage()->showInfoCb( l->removeText(true), silent ); checkConsistency(); ret = v->prepareRemove(); if( ret==0 ) @@ -1487,9 +1469,9 @@ unsigned long new_le = l->getLe(); unsigned long old_le = sizeToLe(v->origSizeK()); getStorage()->getFsCapabilities( l->getFs(), caps ); - if( !silent && old_le!=new_le ) + if( old_le!=new_le ) { - getStorage()->showInfoCb( l->resizeText(true) ); + getStorage()->showInfoCb( l->resizeText(true), silent ); } checkConsistency(); if( v->isMounted() && Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdCo.cc?rev=67271&r1=67270&r2=67271&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdCo.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdCo.cc Tue Jan 24 19:13:05 2012 @@ -504,10 +504,7 @@ int ret = 0; if( m != NULL ) { - if( !silent ) - { - getStorage()->showInfoCb( m->createText(true) ); - } + getStorage()->showInfoCb( m->createText(true), silent ); ret = m->checkDevices(); if( ret==0 ) { @@ -562,10 +559,7 @@ { if( !active ) MdPartCo::activate(true, getStorage()->tmpDir()); - if( !silent ) - { - getStorage()->showInfoCb( m->removeText(true) ); - } + getStorage()->showInfoCb( m->removeText(true), silent ); ret = m->prepareRemove(); if( ret==0 ) { Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdPartCo.cc?rev=67271&r1=67270&r2=67271&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdPartCo.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/MdPartCo.cc Tue Jan 24 19:13:05 2012 @@ -654,10 +654,7 @@ int ret = p?0:MDPART_PARTITION_NOT_FOUND; if( ret==0 ) { - if( !silent ) - { - getStorage()->showInfoCb( md->setTypeText(true) ); - } + getStorage()->showInfoCb( md->setTypeText(true), silent ); ret = disk->doSetType( p ); } y2mil("ret:" << ret); @@ -668,10 +665,7 @@ { y2mil("label:" << labelName()); int ret = 0; - if( !silent ) - { - getStorage()->showInfoCb( setDiskLabelText(true) ); - } + getStorage()->showInfoCb( setDiskLabelText(true), silent ); getStorage()->removeDmMapsTo( device() ); removePresentPartitions(); ret = disk->doCreateLabel(); @@ -878,10 +872,7 @@ Partition *p = NULL; if( ret==0 ) { - if( !silent ) - { - getStorage()->showInfoCb( l->createText(true) ); - } + getStorage()->showInfoCb( l->createText(true), silent ); p = l->getPtr(); if( p==NULL ) ret = MDPART_PARTITION_NOT_FOUND; @@ -953,10 +944,7 @@ ret = MD_REMOVE_FAILED; setExtError( c ); } - if( !silent ) - { - getStorage()->showInfoCb( removeText(true) ); - } + getStorage()->showInfoCb( removeText(true), silent ); if( ret==0 && destrSb ) { SystemCmd c; @@ -986,10 +974,7 @@ ret = MDPART_INVALID_VOLUME; if( ret==0 ) { - if( !silent ) - { - getStorage()->showInfoCb( l->removeText(true) ); - } + getStorage()->showInfoCb( l->removeText(true), silent ); ret = v->prepareRemove(); } if( ret==0 ) @@ -1031,10 +1016,7 @@ if( ret==0 ) { needExtend = !l->needShrink(); - if( !silent ) - { - getStorage()->showInfoCb( l->resizeText(true) ); - } + getStorage()->showInfoCb( l->resizeText(true), silent ); if( l->isMounted() ) { ret = l->umount(); Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/NfsCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/NfsCo.cc?rev=67271&r1=67270&r2=67271&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/NfsCo.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/NfsCo.cc Tue Jan 24 19:13:05 2012 @@ -109,10 +109,7 @@ int ret = 0; if( p != NULL ) { - if( !silent ) - { - getStorage()->showInfoCb( p->removeText(true) ); - } + getStorage()->showInfoCb( p->removeText(true), silent ); y2mil("doRemove container: " << name() << " name:" << p->name()); ret = v->prepareRemove(); if( ret==0 ) Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc?rev=67271&r1=67270&r2=67271&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc Tue Jan 24 19:13:05 2012 @@ -6295,12 +6295,13 @@ (*cb)( id, cur, max ); } -void Storage::showInfoCb(const Text& info) +void Storage::showInfoCb(const Text& info, bool quiet ) { y2mil("INSTALL INFO info:" << info.native); + y2mil("quiet:" << quiet); CallbackShowInstallInfo cb = getCallbackShowInstallInfoTheOne(); lastAction = info; - if( cb ) + if( cb && !quiet ) (*cb)( info.text ); } Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.h?rev=67271&r1=67270&r2=67271&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.h (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.h Tue Jan 24 19:13:05 2012 @@ -623,7 +623,7 @@ { return password_popup_cb ? password_popup_cb : password_popup_cb_ycp; } void progressBarCb(const string& id, unsigned cur, unsigned max) const; - void showInfoCb(const Text& info); + void showInfoCb(const Text& info, bool quiet); void infoPopupCb(const Text& info) const; bool yesnoPopupCb(const Text& info) const; bool commitErrorPopupCb(int error, const Text& last_action, const string& extended_message) const; Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/TmpfsCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/TmpfsCo.cc?rev=67271&r1=67270&r2=67271&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/TmpfsCo.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/TmpfsCo.cc Tue Jan 24 19:13:05 2012 @@ -146,10 +146,7 @@ Tmpfs *b = dynamic_cast<Tmpfs *>(v); if( b != NULL ) { - if( !silent ) - { - getStorage()->showInfoCb( b->removeText(true) ); - } + getStorage()->showInfoCb( b->removeText(true), silent ); ret = v->prepareRemove(); if( ret==0 && !removeFromList(v) ) ret = TMPFS_REMOVE_NO_TMPFS; Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc?rev=67271&r1=67270&r2=67271&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc Tue Jan 24 19:13:05 2012 @@ -929,10 +929,7 @@ int ret = 0; bool needMount = false; y2mil("device:" << dev); - if( !silent ) - { - getStorage()->showInfoCb( formatText(true) ); - } + getStorage()->showInfoCb( formatText(true), silent ); if (isUsedBy()) { ret = VOLUME_ALREADY_IN_USE; @@ -1395,10 +1392,7 @@ { int ret = 0; y2mil("device:" << dev << " mp:" << mp << " orig_mp:" << orig_mp); - if( !silent ) - { - getStorage()->showInfoCb( mountText(true) ); - } + getStorage()->showInfoCb( mountText(true), silent ); if( ret==0 && !orig_mp.empty() && isMounted() ) { ret = umount(getStorage()->prependRoot(orig_mp)); @@ -2112,9 +2106,9 @@ { int ret = 0; y2mil("device:" << dev << " mp:" << mp << " is_loop:" << is_loop << " loop_active:" << loop_active); - if( !silent && is_loop && !dmcrypt() ) + if( is_loop && !dmcrypt() ) { - getStorage()->showInfoCb( losetupText(true) ); + getStorage()->showInfoCb( losetupText(true), silent ); } if( is_mounted ) { @@ -2218,9 +2212,9 @@ int ret = 0; y2mil("device:" << dev << " mp:" << mp << " dmcrypt:" << dmcrypt() << " active:" << dmcrypt_active << " format:" << format ); - if( !silent && dmcrypt() ) + if( dmcrypt() ) { - getStorage()->showInfoCb( crsetupText(true) ); + getStorage()->showInfoCb( crsetupText(true), silent ); } if( is_mounted ) { @@ -2384,10 +2378,7 @@ bool remount = false; FsCapabilities caps; y2mil("device:" << dev << " mp:" << mp << " label:" << label); - if( !silent ) - { - getStorage()->showInfoCb( labelText(true) ); - } + getStorage()->showInfoCb( labelText(true), silent ); if (!getStorage()->getFsCapabilities(fs, caps) || !caps.supportsLabel) { ret = VOLUME_LABEL_TOO_LONG; @@ -2863,10 +2854,7 @@ ((cType()==LOOP||cType()==TMPFSC) && fstab->findMount( mp, entry ))) ) { changed = true; - if( !silent ) - { - getStorage()->showInfoCb(fstab->removeText(true, entry.cryptotab, entry.mount)); - } + getStorage()->showInfoCb(fstab->removeText(true, entry.cryptotab, entry.mount), silent); y2mil("before removeEntry"); ret = fstab->removeEntry( entry ); } @@ -2927,11 +2915,11 @@ crypt_pwd.empty(); if( changed ) { - if( !silent && !fstab_added ) + if( !fstab_added ) { getStorage()->showInfoCb( fstab->updateText( true, inCryptotab(), - che.mount )); + che.mount ), silent); } y2mil( "update fstab: " << che ); ret = fstab->updateEntry( che ); @@ -2958,11 +2946,8 @@ che.mount = mp; che.freq = fstabFreq(); che.passno = fstabPassno(); - if( !silent ) - { - getStorage()->showInfoCb( - fstab->addText( true, inCryptotab(), che.mount )); - } + getStorage()->showInfoCb( + fstab->addText( true, inCryptotab(), che.mount ),silent); ret = fstab->addEntry( che ); fstab_added = true; } Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes?rev=67271&r1=67270&r2=67271&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Tue Jan 24 19:13:05 2012 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Tue Jan 24 17:55:44 CET 2012 - fehr@suse.de +- make sure error popup contains always valid info - remove btrfs volumes when partition table gets destroyed (bnc#742491) ------------------------------------------------------------------- -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
fehr＠svn2.opensuse.org