YaST Commits March 2009

yast-commit@lists.opensuse.org

20 participants
693 discussions

[yast-commit] r56448 - in /trunk/storage/libstorage/src: AsciiFile.cc AsciiFile.h Storage.cc Storage.h
by aschnell＠svn.opensuse.org 28 Mar '09

28 Mar '09

Author: aschnell Date: Fri Mar 27 16:20:12 2009 New Revision: 56448 URL: http://svn.opensuse.org/viewcvs/yast?rev=56448&view=rev Log: - added AsciiFile::logContent Modified: trunk/storage/libstorage/src/AsciiFile.cc trunk/storage/libstorage/src/AsciiFile.h trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Storage.h Modified: trunk/storage/libstorage/src/AsciiFile.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AsciiFile… ============================================================================== --- trunk/storage/libstorage/src/AsciiFile.cc (original) +++ trunk/storage/libstorage/src/AsciiFile.cc Fri Mar 27 16:20:12 2009 @@ -21,7 +21,7 @@ : Name_C(Name_Cv), remove_empty(remove_empty) { - load(); + reload(); } @@ -29,7 +29,7 @@ : Name_C(Name_Cv), remove_empty(remove_empty) { - load(); + reload(); } @@ -39,7 +39,7 @@ bool -AsciiFile::load() +AsciiFile::reload() { y2mil("loading file " << Name_C); clear(); @@ -89,6 +89,15 @@ } + void + AsciiFile::logContent() const + { + y2mil("content of " << Name_C); + for (vector<string>::const_iterator it = Lines_C.begin(); it != Lines_C.end(); ++it) + y2mil(*it); + } + + void AsciiFile::append( const string& Line_Cv ) { string::size_type Idx_ii; Modified: trunk/storage/libstorage/src/AsciiFile.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AsciiFile… ============================================================================== --- trunk/storage/libstorage/src/AsciiFile.h (original) +++ trunk/storage/libstorage/src/AsciiFile.h Fri Mar 27 16:20:12 2009 @@ -23,9 +23,11 @@ string name() const { return Name_C; } - bool load(); + bool reload(); bool save(); + void logContent() const; + void append( const string& Line_Cv ); void append( const vector<string>& Lines_Cv ); void insert( unsigned int Before_iv, const string& Line_Cv ); 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 Fri Mar 27 16:20:12 2009 @@ -110,12 +110,7 @@ void Storage::logSystemInfo() const { - ifstream File( "/proc/version" ); - classic(File); - string line; - getline( File, line ); - File.close(); - y2mil( "kernel version:" << line ); + AsciiFile("/proc/version").logContent(); } @@ -4618,19 +4613,17 @@ } -void -Storage::logProcData( const string& l ) -{ - y2mil( "begin:" << l ); - ProcPart t; - AsciiFile md( "/proc/mdstat" ); - for( unsigned i=0; i<md.numLines(); i++ ) - y2mil( "mdstat:" << i+1 << ". line:" << md[i] ); - AsciiFile mo( "/proc/mounts" ); - for( unsigned i=0; i<mo.numLines(); i++ ) - y2mil( "mounts:" << i+1 << ". line:" << mo[i] ); - y2mil( "end" << l ); -} + void + Storage::logProcData(const string& str) const + { + y2mil("begin:" << str); + + AsciiFile("/proc/partitions").logContent(); + AsciiFile("/proc/mdstat").logContent(); + AsciiFile("/proc/mounts").logContent(); + + y2mil("end" << str); + } bool Storage::findVolume( const string& device, ContIterator& c, Modified: trunk/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.h… ============================================================================== --- trunk/storage/libstorage/src/Storage.h (original) +++ trunk/storage/libstorage/src/Storage.h Fri Mar 27 16:20:12 2009 @@ -231,7 +231,7 @@ void printInfo(std::ostream& str, const string& name = ""); void logCo(const Container* c) const; void logCo(const string& device); - void logProcData( const string& l="" ); + void logProcData(const string& str = "") const; storage::UsedByType usedBy( const string& dev ); bool usedBy( const string& dev, storage::usedBy& ub ); bool clearUsedBy(const string& dev); -- 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] r56447 - /trunk/storage/libstorage/src/Disk.cc
by aschnell＠svn.opensuse.org 28 Mar '09

28 Mar '09

Author: aschnell Date: Fri Mar 27 15:17:11 2009 New Revision: 56447 URL: http://svn.opensuse.org/viewcvs/yast?rev=56447&view=rev Log: - use appropriate getSize instead of getInfo 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 Fri Mar 27 15:17:11 2009 @@ -854,7 +854,6 @@ { unsigned ext_nr = 0; bool ret=true; - unsigned long Dummy; unsigned long long SizeK; map<unsigned,unsigned long> proc_l; map<unsigned,unsigned long> parted_l; @@ -878,7 +877,7 @@ { pair<string,unsigned> p = getDiskPartition( *i ); if( p.second>0 && p.second!=ext_nr && - pp.getInfo( *i, SizeK, Dummy, Dummy )) + pp.getSize(*i, SizeK)) { proc_l[p.second] = kbToCylinder( SizeK ); } -- 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] r56446 - /trunk/storage/storage/src/modules/StorageProposal.ycp
by aschnell＠svn.opensuse.org 28 Mar '09

28 Mar '09

Author: aschnell Date: Fri Mar 27 14:34:21 2009 New Revision: 56446 URL: http://svn.opensuse.org/viewcvs/yast?rev=56446&view=rev Log: - handle also 'used_by_device' Modified: trunk/storage/storage/src/modules/StorageProposal.ycp Modified: trunk/storage/storage/src/modules/StorageProposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageProposal.ycp (original) +++ trunk/storage/storage/src/modules/StorageProposal.ycp Fri Mar 27 14:34:21 2009 @@ -3045,6 +3045,7 @@ ``{ tg = Storage::DelPartitionData( tg, d, "used_by" ); tg = Storage::DelPartitionData( tg, d, "used_by_type" ); + tg = Storage::DelPartitionData( tg, d, "used_by_device" ); }); } return( tg ); -- 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] r56445 - in /trunk/storage/storage/src/include: lvm_lib.ycp lvm_pv_lib.ycp
by aschnell＠svn.opensuse.org 28 Mar '09

28 Mar '09

Author: aschnell Date: Fri Mar 27 14:28:59 2009 New Revision: 56445 URL: http://svn.opensuse.org/viewcvs/yast?rev=56445&view=rev Log: - handle also used_by_device in get_possible_pvs - some cleanup Modified: trunk/storage/storage/src/include/lvm_lib.ycp trunk/storage/storage/src/include/lvm_pv_lib.ycp Modified: trunk/storage/storage/src/include/lvm_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_lib.ycp (original) +++ trunk/storage/storage/src/include/lvm_lib.ycp Fri Mar 27 14:28:59 2009 @@ -18,14 +18,6 @@ { textdomain "storage"; -define string lvmVg( string vg ) - { - integer pos = search( vg, "/" ); - if( pos!=nil ) - return( substring( vg, pos+1 )); - else - return( vg ); - } ////////////////////////////////////////////////////////////////////// // get a list of all volume groups in the targetMap Modified: trunk/storage/storage/src/include/lvm_pv_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_pv_lib.ycp (original) +++ trunk/storage/storage/src/include/lvm_pv_lib.ycp Fri Mar 27 14:28:59 2009 @@ -105,7 +105,7 @@ { parts = []; y2milestone( "get_possible_pvs no parts, disk used by %1 %2", - devmap["used_by_type"]:`UB_NONE, devmap["used_by"]:"" ); + devmap["used_by_type"]:`UB_NONE, devmap["used_by_device"]:"" ); } if( size(devmap["partitions"]:[])==0 && Storage::IsPartType(devmap["type"]:`CT_UNKNOWN) && @@ -116,17 +116,13 @@ if( devmap["used_by_type"]:`UB_NONE != `UB_NONE ) { p["used_by_type"] = devmap["used_by_type"]:`UB_NONE; + p["used_by_device"] = devmap["used_by_device"]:""; p["used_by"] = devmap["used_by"]:""; } parts = [ p ]; } ret = (list<map>)merge( ret, parts ); }); - ret = maplist( map p, ret, - ``{ - p["used_by"] = lvmVg( p["used_by"]:"" ); - return( p ); - }); y2milestone( "get_possible_pvs ret %1", 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] r56444 - /tags/branch-SLE-10-SP3-2_13_124/pkg-bindings/
by lslezak＠svn.opensuse.org 28 Mar '09

28 Mar '09

Author: lslezak Date: Fri Mar 27 14:12:41 2009 New Revision: 56444 URL: http://svn.opensuse.org/viewcvs/yast?rev=56444&view=rev Log: Created tag branch-SLE-10-SP3-2_13_124 for pkg-bindings Added: tags/branch-SLE-10-SP3-2_13_124/pkg-bindings/ - copied from r56443, branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/ -- 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] r56443 - in /branches/SuSE-SLE-10-SP3-Branch/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/Source.cc
by lslezak＠svn.opensuse.org 28 Mar '09

28 Mar '09

Author: lslezak Date: Fri Mar 27 14:12:36 2009 New Revision: 56443 URL: http://svn.opensuse.org/viewcvs/yast?rev=56443&view=rev Log: - Fixed Pkg::SourceCreate() - make the new alias unique - timestamp alias uses 1 second granularity which might not be sufficient in AutoYast (bnc#406720) - 2.13.124 Modified: branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/VERSION branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/package/yast2-pkg-bindings.changes branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/src/Source.cc Modified: branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/pkg-bi… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/VERSION Fri Mar 27 14:12:36 2009 @@ -1 +1 @@ -2.13.123 +2.13.124 Modified: branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/pkg-bi… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Fri Mar 27 14:12:36 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Mar 27 13:57:53 CET 2009 - lslezak(a)suse.cz + +- Fixed Pkg::SourceCreate() - make the new alias unique - timestamp + alias uses 1 second granularity which might not be sufficient + in AutoYast (bnc#406720) +- 2.13.124 + +------------------------------------------------------------------- Wed Mar 25 13:41:30 CET 2009 - lslezak(a)suse.cz - Fixed Pkg::ResolvableProperties() - return `removed status for Modified: branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/src/Source.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/pkg-bi… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/src/Source.cc (original) +++ branches/SuSE-SLE-10-SP3-Branch/pkg-bindings/src/Source.cc Fri Mar 27 14:12:36 2009 @@ -25,6 +25,9 @@ //#include <sys/statvfs.h> #include <iostream> +#include <sstream> +#include <algorithm> + #include <ycp/y2log.h> #include <ycpTools.h> @@ -1037,11 +1040,15 @@ bool alias_found = false; std::list<zypp::SourceManager::SourceId> ids = zypp::SourceManager::sourceManager()->allSources(); + // remember the existing aliases + std::list<std::string> aliases; + for( std::list<zypp::SourceManager::SourceId>::iterator it = ids.begin(); it != ids.end(); ++it) { try { zypp::Source_Ref src = zypp::SourceManager::sourceManager()->findSource(*it); + aliases.push_back(src.alias()); if (src.alias() == newsrc.alias()) { @@ -1085,7 +1092,28 @@ alias += timestamp (); + // does the alias already exist? + if (std::find_if(aliases.begin(), aliases.end(), std::bind2nd(std::equal_to<std::string>(), alias)) != aliases.end()) + { + // yes, make the alias unique (see bnc #406720) + int uniq_suffix = 0; + std::string new_alias; + + do + { + std::ostringstream os; + os << alias << '_' << uniq_suffix; + new_alias = os.str(); + uniq_suffix++; + } + while (std::find_if(aliases.begin(), aliases.end(), std::bind2nd(std::equal_to<std::string>(), new_alias)) != aliases.end()); + + y2milestone("Make the new alias unique: '%s' -> '%s'", alias.c_str(), new_alias.c_str()); + alias = new_alias; + } + newsrc.setAlias( alias ); + y2milestone("Using time stamp '%s' as the alias", alias.c_str()); } -- 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] r56442 - /trunk/network/src/clients/modem_proposal.ycp
by kmachalkova＠svn.opensuse.org 28 Mar '09

28 Mar '09

Author: kmachalkova Date: Fri Mar 27 13:27:10 2009 New Revision: 56442 URL: http://svn.opensuse.org/viewcvs/yast?rev=56442&view=rev Log: Put closing busy pop-up to the right place (otherwise it closes topmost dialog in automatic configuration) - #487566 Modified: trunk/network/src/clients/modem_proposal.ycp Modified: trunk/network/src/clients/modem_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/modem_propos… ============================================================================== --- trunk/network/src/clients/modem_proposal.ycp (original) +++ trunk/network/src/clients/modem_proposal.ycp Fri Mar 27 13:27:10 2009 @@ -39,12 +39,15 @@ if (! GetInstArgs::automatic_configuration()) /* Popup text */ BusyPopup(_("Detecting modems...")); + boolean progress_orig = Progress::set (false); Modem::Read(); // no Modem::Propose () ? if (! GetInstArgs::automatic_configuration()) + { Progress::set (progress_orig); - BusyPopupClose(); + BusyPopupClose(); + } } list sum = Modem::Summary(false); proposal = sum[0]:""; -- 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] r56441 - /trunk/qt/src/YQBarGraph.cc
by kmachalkova＠svn.opensuse.org 28 Mar '09

28 Mar '09

Author: kmachalkova Date: Fri Mar 27 13:10:41 2009 New Revision: 56441 URL: http://svn.opensuse.org/viewcvs/yast?rev=56441&view=rev Log: Show the text only when it fits the segment (clipped strings in too narrow segments look silly) It'll be still available via tooltip anyway Modified: trunk/qt/src/YQBarGraph.cc Modified: trunk/qt/src/YQBarGraph.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQBarGraph.cc?rev=56441&r… ============================================================================== --- trunk/qt/src/YQBarGraph.cc (original) +++ trunk/qt/src/YQBarGraph.cc Fri Mar 27 13:10:41 2009 @@ -96,6 +96,8 @@ int x_off = YQBarGraphOuterMargin; int y_off = YQBarGraphOuterMargin; int valueTotal = 0; + QFontMetrics fm = painter.fontMetrics(); + toolTips.clear(); for ( int i=0; i < segments(); i++ ) @@ -108,6 +110,7 @@ { const YBarGraphSegment & seg = segment(i); int segWidth = ( (long) totalWidth * seg.value() ) / valueTotal; + int stringWidth = 0; if ( i == segments()-1 ) { @@ -155,14 +158,21 @@ if ( txt.contains( "%1" ) ) txt = txt.arg( seg.value() ); // substitute variable - painter.drawText( x_off + YQBarGraphLabelHorizontalMargin, + stringWidth = fm.size(0,txt).width(); + + // draw the text only if it fits the current segment width ... + if (stringWidth < segWidth) + { + painter.drawText( x_off + YQBarGraphLabelHorizontalMargin, y_off + YQBarGraphLabelVerticalMargin, segWidth - 2 * YQBarGraphLabelHorizontalMargin + 1, segHeight - 2 * YQBarGraphLabelVerticalMargin + 1, Qt::AlignCenter, txt ); + } - + // ... but always make it available via tooltip toolTips.insert(make_pair( x_off, txt)); + // Prepare for the next segment x_off += segWidth; -- 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] r56440 - in /trunk/storage/libstorage: examples/TestLoop.cc examples/TestLvm.cc examples/TestMd.cc src/Dasd.cc src/OutputProcessor.cc src/OutputProcessor.h src/SystemCmd.cc src/Volume.cc
by aschnell＠svn.opensuse.org 28 Mar '09

28 Mar '09

Author: aschnell Date: Fri Mar 27 12:45:53 2009 New Revision: 56440 URL: http://svn.opensuse.org/viewcvs/yast?rev=56440&view=rev Log: - some cleanup Modified: trunk/storage/libstorage/examples/TestLoop.cc trunk/storage/libstorage/examples/TestLvm.cc trunk/storage/libstorage/examples/TestMd.cc trunk/storage/libstorage/src/Dasd.cc trunk/storage/libstorage/src/OutputProcessor.cc trunk/storage/libstorage/src/OutputProcessor.h trunk/storage/libstorage/src/SystemCmd.cc trunk/storage/libstorage/src/Volume.cc Modified: trunk/storage/libstorage/examples/TestLoop.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/examples/Test… ============================================================================== --- trunk/storage/libstorage/examples/TestLoop.cc (original) +++ trunk/storage/libstorage/examples/TestLoop.cc Fri Mar 27 12:45:53 2009 @@ -6,9 +6,9 @@ using namespace storage; using namespace std; -void scrollbarCb( const string& id, unsigned cur, unsigned max ) +void progressbarCb( const string& id, unsigned cur, unsigned max ) { - cout << "SCROLLBAR id:" << id << " cur:" << cur << " max:" << max << endl; + cout << "PROGRESSBAR id:" << id << " cur:" << cur << " max:" << max << endl; } void installInfoCb( const string& info ) @@ -49,7 +49,7 @@ initDefaultLogger(); //StorageInterface* s = createStorageInterface(false,true); StorageInterface* s = createDefaultStorageInterface(); - s->setCallbackProgressBar( scrollbarCb ); + s->setCallbackProgressBar( progressbarCb ); s->setCallbackShowInstallInfo( installInfoCb ); string disk = "/dev/hdb"; string device; Modified: trunk/storage/libstorage/examples/TestLvm.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/examples/Test… ============================================================================== --- trunk/storage/libstorage/examples/TestLvm.cc (original) +++ trunk/storage/libstorage/examples/TestLvm.cc Fri Mar 27 12:45:53 2009 @@ -6,9 +6,9 @@ using namespace storage; using namespace std; -void scrollbarCb( const string& id, unsigned cur, unsigned max ) +void progressbarCb( const string& id, unsigned cur, unsigned max ) { - cout << "SCROLLBAR id:" << id << " cur:" << cur << " max:" << max << endl; + cout << "PROGRESSBAR id:" << id << " cur:" << cur << " max:" << max << endl; } void installInfoCb( const string& info ) @@ -47,7 +47,7 @@ initDefaultLogger(); //StorageInterface* s = createStorageInterface(false,true); StorageInterface* s = createDefaultStorageInterface(); - s->setCallbackProgressBar( scrollbarCb ); + s->setCallbackProgressBar( progressbarCb ); s->setCallbackShowInstallInfo( installInfoCb ); string disk = "/dev/hdb"; string device; Modified: trunk/storage/libstorage/examples/TestMd.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/examples/Test… ============================================================================== --- trunk/storage/libstorage/examples/TestMd.cc (original) +++ trunk/storage/libstorage/examples/TestMd.cc Fri Mar 27 12:45:53 2009 @@ -6,9 +6,9 @@ using namespace storage; using namespace std; -void scrollbarCb( const string& id, unsigned cur, unsigned max ) +void progressbarCb( const string& id, unsigned cur, unsigned max ) { - cout << "SCROLLBAR id:" << id << " cur:" << cur << " max:" << max << endl; + cout << "PROGRESSBAR id:" << id << " cur:" << cur << " max:" << max << endl; } void installInfoCb( const string& info ) @@ -49,7 +49,7 @@ initDefaultLogger(); //StorageInterface* s = createStorageInterface(false,true); StorageInterface* s = createDefaultStorageInterface(); - s->setCallbackProgressBar( scrollbarCb ); + s->setCallbackProgressBar( progressbarCb ); s->setCallbackShowInstallInfo( installInfoCb ); string disk = "/dev/hdb"; string device; 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 Fri Mar 27 12:45:53 2009 @@ -556,7 +556,7 @@ string cmd_line = DASDFMTBIN " -Y -P 4 -b 4096 -y -m 1 -d cdl " + boost::join(devs, " "); y2mil("cmdline:" << cmd_line); CallbackProgressBar cb = getStorage()->getCallbackProgressBarTheOne(); - ScrollBarHandler* sb = new DasdfmtScrollbar( cb ); + ProgressBar* sb = new DasdfmtProgressBar( cb ); SystemCmd cmd; cmd.setOutputProcessor( sb ); if( execCheckFailed( cmd, cmd_line ) ) Modified: trunk/storage/libstorage/src/OutputProcessor.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/OutputPro… ============================================================================== --- trunk/storage/libstorage/src/OutputProcessor.cc (original) +++ trunk/storage/libstorage/src/OutputProcessor.cc Fri Mar 27 12:45:53 2009 @@ -2,7 +2,6 @@ Textdomain "storage" */ -#include <sstream> #include "y2storage/AppUtil.h" #include "y2storage/StorageTmpl.h" @@ -15,15 +14,7 @@ void -ScrollBarHandler::process( const string& val, bool stderr ) - { - y2mil("val:" << val << " stderr:" << stderr); - static int cnt=0; - setCurValue( cnt++/2 ); - } - -void -ScrollBarHandler::setCurValue( unsigned val ) +ProgressBar::setCurValue(unsigned val) { if( first || val!=cur ) { @@ -36,7 +27,7 @@ } void -Mke2fsScrollbar::process( const string& val, bool stderr ) +Mke2fsProgressBar::process(const string& val, bool stderr) { y2deb("val:" << val << " err:" << stderr << " done:" << done); if( !stderr && !done ) @@ -84,14 +75,14 @@ } if( seen.find( "done" )!=string::npos ) { - setCurValue( max-4 ); + setCurValue(getMaxValue() - 4); done = true; } } } void -ReiserScrollbar::process( const string& val, bool stderr ) +ReiserProgressBar::process(const string& val, bool stderr) { y2deb("val:" << val << " err:" << stderr); if( !stderr ) @@ -122,7 +113,7 @@ } void -DasdfmtScrollbar::process( const string& val, bool stderr ) +DasdfmtProgressBar::process(const string& val, bool stderr) { y2deb("val:" << val << " err:" << stderr); if( !stderr ) @@ -146,7 +137,7 @@ while( bpos != string::npos ) { cur_cyl++; - setCurValue( cur_cyl*max/max_cyl ); + setCurValue( cur_cyl*getMaxValue()/max_cyl ); seen.erase( 0, bpos+1 ); bpos = seen.find( "|" ); } Modified: trunk/storage/libstorage/src/OutputProcessor.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/OutputPro… ============================================================================== --- trunk/storage/libstorage/src/OutputProcessor.h (original) +++ trunk/storage/libstorage/src/OutputProcessor.h Fri Mar 27 12:45:53 2009 @@ -1,8 +1,10 @@ #ifndef OUTPUT_PROCESSOR_H #define OUTPUT_PROCESSOR_H + #include "y2storage/StorageInterface.h" + namespace storage { @@ -12,66 +14,94 @@ OutputProcessor() {} virtual ~OutputProcessor() {} virtual void reset() = 0; - virtual void finished() = 0; + virtual void finish() = 0; virtual void process(const string& txt, bool stderr) = 0; }; -class ScrollBarHandler : public OutputProcessor + class ProgressBar : public OutputProcessor { public: - ScrollBarHandler( const string& sid, storage::CallbackProgressBar cb ) - { id=sid; first=true; callback=cb; cur=0; max=100; } - virtual ~ScrollBarHandler() {} - virtual void reset() { first=true; cur=0; } - virtual void finished() { setCurValue( max ); } - virtual void process( const string& txt, bool stderr ); - void setMaxValue( unsigned val ) { max=val; } - unsigned getMaxValue() { return( max ); } - void setCurValue( unsigned val ); - unsigned getCurValue() { return( cur ); } + ProgressBar(const string& id, CallbackProgressBar callback) + : id(id), callback(callback), first(true), max(100), cur(0) + {} + + virtual ~ProgressBar() {} + + virtual void reset() { first = true; cur = 0; } + virtual void finish() { setCurValue(max); } + virtual void process(const string& txt, bool stderr) {} + + void setMaxValue(unsigned val) { max = val; } + unsigned getMaxValue() const { return max; } + void setCurValue(unsigned val); + unsigned getCurValue() const { return cur; } protected: + const string id; + const CallbackProgressBar callback; + + bool first; + + private: unsigned long max; unsigned long cur; - bool first; - string id; - storage::CallbackProgressBar callback; }; -class Mke2fsScrollbar : public ScrollBarHandler + + class Mke2fsProgressBar : public ProgressBar { public: - Mke2fsScrollbar( storage::CallbackProgressBar cb ) : - ScrollBarHandler( "format", cb ) { done=false; } - virtual void process( const string& txt, bool stderr ); + Mke2fsProgressBar(CallbackProgressBar callback) + : ProgressBar("format", callback) + { + setMaxValue(100); + done = false; + } + + virtual void process(const string& txt, bool stderr); + protected: string seen; bool done; }; -class ReiserScrollbar : public ScrollBarHandler + + class ReiserProgressBar : public ProgressBar { public: - ReiserScrollbar( storage::CallbackProgressBar cb ) : - ScrollBarHandler( "format", cb ) { max=100; } - virtual void process( const string& txt, bool stderr ); + ReiserProgressBar(CallbackProgressBar callback) + : ProgressBar("format", callback) + { + setMaxValue(100); + } + + virtual void process(const string& txt, bool stderr); + protected: string seen; }; -class DasdfmtScrollbar : public ScrollBarHandler + + class DasdfmtProgressBar : public ProgressBar { public: - DasdfmtScrollbar( storage::CallbackProgressBar cb ) : - ScrollBarHandler( "dasdfmt", cb ) { max=100; max_cyl=cur_cyl=0; } - virtual void process( const string& txt, bool stderr ); + DasdfmtProgressBar(CallbackProgressBar callback) + : ProgressBar("dasdfmt", callback) + { + setMaxValue(100); + max_cyl = cur_cyl = 0; + } + + virtual void process(const string& txt, bool stderr); + protected: string seen; - unsigned long cur_cyl; unsigned long max_cyl; + unsigned long cur_cyl; }; } + #endif Modified: trunk/storage/libstorage/src/SystemCmd.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/SystemCmd… ============================================================================== --- trunk/storage/libstorage/src/SystemCmd.cc (original) +++ trunk/storage/libstorage/src/SystemCmd.cc Fri Mar 27 12:45:53 2009 @@ -329,7 +329,7 @@ } if( output_proc ) { - output_proc->finished(); + output_proc->finish(); } } 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 Fri Mar 27 12:45:53 2009 @@ -724,7 +724,7 @@ { string cmd; string params; - ScrollBarHandler* p = NULL; + ProgressBar* p = NULL; CallbackProgressBar cb = cont->getStorage()->getCallbackProgressBarTheOne(); switch( fs ) @@ -733,12 +733,12 @@ case EXT3: cmd = "/sbin/mke2fs"; params = (fs==EXT2) ? "-v" : "-j -v"; - p = new Mke2fsScrollbar( cb ); + p = new Mke2fsProgressBar( cb ); break; case REISERFS: cmd = "/sbin/mkreiserfs"; params = "-f -f"; - p = new ReiserScrollbar( cb ); + p = new ReiserProgressBar( cb ); break; case VFAT: cmd = "/sbin/mkdosfs"; -- 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] r56439 - in /trunk/storage/libstorage/src: OutputProcessor.cc OutputProcessor.h
by aschnell＠svn.opensuse.org 27 Mar '09

27 Mar '09

Author: aschnell Date: Fri Mar 27 11:40:07 2009 New Revision: 56439 URL: http://svn.opensuse.org/viewcvs/yast?rev=56439&view=rev Log: - force overriding virtual functions Modified: trunk/storage/libstorage/src/OutputProcessor.cc trunk/storage/libstorage/src/OutputProcessor.h Modified: trunk/storage/libstorage/src/OutputProcessor.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/OutputPro… ============================================================================== --- trunk/storage/libstorage/src/OutputProcessor.cc (original) +++ trunk/storage/libstorage/src/OutputProcessor.cc Fri Mar 27 11:40:07 2009 @@ -15,15 +15,9 @@ void -OutputProcessor::process( const string& val, bool stderr ) - { - y2mil("stderr:" << stderr << " val:" << val); - } - -void ScrollBarHandler::process( const string& val, bool stderr ) { - OutputProcessor::process( val, stderr ); + y2mil("val:" << val << " stderr:" << stderr); static int cnt=0; setCurValue( cnt++/2 ); } Modified: trunk/storage/libstorage/src/OutputProcessor.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/OutputPro… ============================================================================== --- trunk/storage/libstorage/src/OutputProcessor.h (original) +++ trunk/storage/libstorage/src/OutputProcessor.h Fri Mar 27 11:40:07 2009 @@ -6,16 +6,17 @@ namespace storage { -class OutputProcessor + class OutputProcessor { public: OutputProcessor() {} virtual ~OutputProcessor() {} - virtual void reset() {} - virtual void finished() {} - virtual void process( const string& txt, bool stderr ); + virtual void reset() = 0; + virtual void finished() = 0; + virtual void process(const string& txt, bool stderr) = 0; }; + class ScrollBarHandler : public OutputProcessor { public: -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
70
Older →

Jump to page:

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

YaST Commits March 2009